Update defaults for InstantExtended.

chrome/browser/profiles/profile_manager_unittest.cc

Index: chrome/browser/profiles/profile_manager_unittest.cc
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 87dd48894c9064ec5d641d57b712ffcb981da9eb..54e0c975e1e2fcfeb7f66dea4366be19194cc725 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -29,6 +29,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/scoped_testing_local_state.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -82,7 +83,7 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit {
 
 }  // namespace
 
-class ProfileManagerTest : public testing::Test {
+class ProfileManagerTest : public BrowserWithTestWindowTest {

[Jered, 2013/10/01 20:57:34]

This seems nice, but how is this change related to this CL?

[samarth, 2013/10/02 00:18:00]

It just need to define content::RenderViewHostTestEnabler (which inheriting from
BrowserWithWindowTest gets you for free).  But changed it to just explicitly
define that in case this has other side effects that we don't want.

  protected:
   class MockObserver {
    public:
@@ -95,18 +96,20 @@ class ProfileManagerTest : public testing::Test {
   }
 
   virtual void SetUp() {
+    BrowserWithTestWindowTest::SetUp();
     // Create a new temporary directory, and store the path
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     TestingBrowserProcess::GetGlobal()->SetProfileManager(
         new UnittestProfileManager(temp_dir_.path()));
 
 #if defined(OS_CHROMEOS)
-  CommandLine* cl = CommandLine::ForCurrentProcess();
-  cl->AppendSwitch(switches::kTestType);
+    CommandLine* cl = CommandLine::ForCurrentProcess();
+    cl->AppendSwitch(switches::kTestType);
 #endif
   }
 
   virtual void TearDown() {
+    BrowserWithTestWindowTest::TearDown();
     TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
     base::RunLoop().RunUntilIdle();
   }
@@ -124,20 +127,9 @@ class ProfileManagerTest : public testing::Test {
         std::string());
   }
 
-#if defined(OS_CHROMEOS)
-  chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
-  chromeos::ScopedTestCrosSettings test_cros_settings_;
-#endif
-
   // The path to temporary directory used to contain the test operations.
   base::ScopedTempDir temp_dir_;
   ScopedTestingLocalState local_state_;
-
-  content::TestBrowserThreadBundle thread_bundle_;
-
-#if defined(OS_CHROMEOS)
-  chromeos::ScopedTestUserManager test_user_manager_;
-#endif
 };
 
 TEST_F(ProfileManagerTest, GetProfile) {