Revert 232861 "Disable flaky test: ProfileManagerBrowserTest.Eph..."

trunk/src/chrome/browser/profiles/profile_manager_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_info_cache_observer.h"
@@ skipping 236 matching lines @@
   // Switch to the first profile without opening a new window.
   profiles::SwitchToProfile(path_profile1, desktop_type, false,
                             kOnProfileSwitchDoNothing);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 2U);
   EXPECT_EQ(2U, browser_list->size());
 
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
 }
 
-#if defined(OS_WIN)
-// Flakily times out on Windows: http://crbug.com/314905
-#define MAYBE_EphemeralProfile EphemeralProfile;
-#else
-#define MAYBE_EphemeralProfile DISABLED_EphemeralProfile;
-#endif  // defined(OS_WIN)
-IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, MAYBE_EphemeralProfile) {
+IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, EphemeralProfile) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
     return;
 #endif
 
   // If multiprofile mode is not enabled, you can't switch between profiles.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
@@ skipping 49 matching lines @@
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1U, browser_list->size());
   ASSERT_EQ(1U, cache.GetNumberOfProfiles());
 
   // Closing the last window should not reduce the number of profiles.
   browser_list->get(0)->window()->Close();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(0U, browser_list->size());
   ASSERT_EQ(1U, cache.GetNumberOfProfiles());
 }