Consolidate platform app files in chrome/browser/apps/platform_apps.

This CL moves all files within chrome/browser/apps to
chrome/browser/apps/platform_apps to tidy up the directory. There is no
change in functionality, and all changes in files are one of:
 * renames of includes
 * updates to header guards
 * the result of git cl format

BUG=None
[email protected],[email protected]

Change-Id: Ic6f45148577c244e906e295301f9c76024e2023e
Reviewed-on: https://chromium-review.googlesource.com/1126686
Commit-Queue: Dominick Ng <[email protected]>
Reviewed-by: Trent Apted <[email protected]>
Cr-Commit-Position: refs/heads/master@{#572902}
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index e79ba12..4c871ad 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -132,7 +132,7 @@
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 #include "chrome/browser/accessibility/animation_policy_prefs.h"
-#include "chrome/browser/apps/shortcut_manager.h"
+#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.h"
@@ -289,7 +289,7 @@
 #endif
 
 #if defined(OS_WIN)
-#include "chrome/browser/apps/app_launch_for_metro_restart_win.h"
+#include "chrome/browser/apps/platform_apps/app_launch_for_metro_restart_win.h"
 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
 #if defined(GOOGLE_CHROME_BUILD)
 #include "chrome/browser/conflicts/incompatible_applications_updater_win.h"