aura: Clean up compositor initialization/destruction.

chrome/test/base/in_process_browser_test.cc

Index: chrome/test/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 46cd611ed4446ada71d2a8b5de3261c70cef2fd3..3978695ff6072550706c901c220719515f481f8a 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -51,7 +51,6 @@
 #include "net/dns/mock_host_resolver.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
-#include "ui/compositor/compositor_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/audio/audio_handler.h"
@@ -63,7 +62,6 @@
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/windows_version.h"
 #include "ui/base/win/atl_module.h"
-#include "ui/compositor/compositor_setup.h"
 #include "win8/test/metro_registration_helper.h"
 #include "win8/test/test_registrar_constants.h"
 #endif
@@ -218,9 +216,6 @@ void InProcessBrowserTest::SetUp() {
     com_initializer_.reset(new base::win::ScopedCOMInitializer());
     ui::win::CreateATLModuleIfNeeded();
     ASSERT_TRUE(win8::MakeTestDefaultBrowserSynchronously());
-
-    // Ash browser tests need the real compositor.
-    ui::DisableTestCompositor();
   }
 #endif
 
@@ -376,16 +371,6 @@ CommandLine InProcessBrowserTest::GetCommandLineForRelaunch() {
   switches.erase(switches::kSingleProcess);
   new_command_line.AppendSwitch(content::kLaunchAsBrowser);
 
-#if defined(USE_AURA)
-  // Copy what UITestBase::SetLaunchSwitches() does, and also what
-  // ChromeTestSuite does if the process had went into the test path. Otherwise
-  // tests will fail on bots.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableTestCompositor)) {
-    new_command_line.AppendSwitch(switches::kTestCompositor);
-  }
-#endif
-
   base::FilePath user_data_dir;
   PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
   new_command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir);