Revert 180308

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 187 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_);
-  // TODO: !OS_WIN is temporary, will remove shortly.
-#if defined(USE_AURA) && !defined(OS_WIN)
+#if defined(USE_AURA)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableTestCompositor)) {
     launch_arguments_.AppendSwitch(switches::kTestCompositor);
   }
 #endif
 }
 
 void UITestBase::SetUpProfile() {
 }
 
@@ skipping 493 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);
 }