Aura/ash split: Split the extra parts into ash and aura parts.

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 5a67cf81d644a36e42ee14f22e8730b90a25a252..f5e895f1a0f8cc4f07d83dac98619b1ed03fec41 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -24,8 +24,11 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/gl/gl_switches.h"
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 #include "ash/ash_switches.h"
+#endif
+
+#if defined(USE_AURA)
 #include "ui/aura/aura_switches.h"
 #endif
 
@@ -445,7 +448,7 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kEnablePointerLock)
   },
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   {
     "aura-google-dialog-frames",
     IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME,
@@ -453,6 +456,8 @@ const Experiment kExperiments[] = {
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames)
   },
+#endif
+#if defined(USE_AURA)
   {
     "aura-disable-hold-mouse-moves",
     IDS_FLAGS_AURA_DISABLE_HOLD_MOUSE_MOVES_NAME,
@@ -574,7 +579,7 @@ const Experiment kExperiments[] = {
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kDisableNTPOtherSessionsMenu)
   },
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   {
     "enable-ash-uber-tray",
     IDS_FLAGS_ENABLE_ASH_UBER_TRAY_NAME,