Revert 216780 "Clean up compositor initialization/destruction."

trunk/src/chrome/test/ui/ui_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ui/ui_test.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include <sys/types.h>
 #endif
@@ skipping 40 matching lines @@
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/testing_profile.h"
 #include "net/base/net_util.h"
 #include "ui/gl/gl_implementation.h"
 #include "url/gurl.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
+#if defined(USE_AURA)
+#include "ui/compositor/compositor_switches.h"
+#endif
+
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 
 const wchar_t UITestBase::kFailedNoCrashService[] =
 #if defined(OS_WIN)
     L"NOTE: This test is expected to fail if crash_service.exe is not "
     L"running. Start it manually before running this test (see the build "
     L"output directory).";
 #elif defined(OS_LINUX)
@@ skipping 126 matching lines @@
     if (!launch_arguments_.HasSwitch(switches::kHomePage))
       launch_arguments_.AppendSwitchASCII(switches::kHomePage, homepage_);
 
     if (launch_arguments_.GetArgs().empty() &&
         !launch_arguments_.HasSwitch(switches::kRestoreLastSession)) {
       launch_arguments_.AppendArg(homepage_);
     }
   }
   if (!test_name_.empty())
     launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_);
+#if defined(USE_AURA)
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableTestCompositor)) {
+    launch_arguments_.AppendSwitch(switches::kTestCompositor);
+  }
+#endif
 }
 
 void UITestBase::SetUpProfile() {
 }
 
 void UITestBase::LaunchBrowser() {
   LaunchBrowser(launch_arguments_, clear_profile_);
 }
 
 void UITestBase::LaunchBrowserAndServer() {
@@ skipping 465 matching lines @@
   ASSERT_TRUE(session_end_completed);
 
   // Make sure session restore says we didn't crash.
   scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences());
   ASSERT_TRUE(profile_prefs.get());
   std::string exit_type;
   ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly,
                                         &exit_type));
   EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type);
 }