Change RenderViewHostTestHarness to create BrowserContext after thread startup

chrome/browser/password_manager/password_generation_manager_unittest.cc

 // Copyright 2013 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 <vector>
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/password_manager/password_generation_manager.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate_impl.h"
@@ skipping 26 matching lines @@
 
  private:
   std::vector<bool> sent_states_;
 
   DISALLOW_COPY_AND_ASSIGN(TestPasswordGenerationManager);
 };
 
 class PasswordGenerationManagerTest : public ChromeRenderViewHostTestHarness {
  protected:
   virtual void SetUp() OVERRIDE {
-    TestingProfile* profile = CreateProfile();
-    profile->CreateRequestContext();
-    browser_context_.reset(profile);
 
     SetThreadBundleOptions(content::TestBrowserThreadBundle::REAL_IO_THREAD);
     ChromeRenderViewHostTestHarness::SetUp();
 
     password_generation_manager_.reset(
         new TestPasswordGenerationManager(web_contents()));
   }
 
   virtual void TearDown() OVERRIDE {
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
-  virtual TestingProfile* CreateProfile() {
-    return new TestingProfile();
+  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE {
+    TestingProfile* profile = new TestingProfile();
+    profile->CreateRequestContext();
+    return profile;
   }
 
   void UpdateState(bool new_renderer) {
     password_generation_manager_->UpdateState(NULL, new_renderer);
   }
 
   scoped_ptr<TestPasswordGenerationManager> password_generation_manager_;
 };
 
 class IncognitoPasswordGenerationManagerTest :
     public PasswordGenerationManagerTest {
  public:
-  virtual TestingProfile* CreateProfile() OVERRIDE {
+  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE {
     // Create an incognito profile.
     TestingProfile::Builder builder;
     scoped_ptr<TestingProfile> profile = builder.Build();
     profile->set_incognito(true);
+    profile->CreateRequestContext();
     return profile.release();
   }
 };
 
 TEST_F(PasswordGenerationManagerTest, UpdateState) {
   PasswordManagerDelegateImpl::CreateForWebContents(web_contents());
   PasswordManager::CreateForWebContentsAndDelegate(
       web_contents(),
       PasswordManagerDelegateImpl::FromWebContents(web_contents()));
 
@@ skipping 112 matching lines @@
   prefs->SetBoolean(prefs::kSyncKeepEverythingSynced, false);
   // Always set password generation enabled check box so we can test the
   // behavior of password sync.
   prefs->SetBoolean(prefs::kPasswordGenerationEnabled, true);
 
   browser_sync::SyncPrefs sync_prefs(profile()->GetPrefs());
   sync_prefs.SetSyncSetupCompleted();
   UpdateState(false);
   EXPECT_EQ(0u, password_generation_manager_->GetSentStates().size());
 }