Change RenderViewHostTestHarness to create BrowserContext after thread startup

components/autofill/core/browser/autofill_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 <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 716 matching lines @@
   std::vector<int> autofill_unique_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillExternalDelegate);
 };
 
 }  // namespace
 
 class AutofillManagerTest : public ChromeRenderViewHostTestHarness {
  public:
   virtual void SetUp() OVERRIDE {
-    TestingProfile* profile = CreateProfile();
-    profile->CreateRequestContext();
-    browser_context_.reset(profile);
+    ChromeRenderViewHostTestHarness::SetUp();
+
     autofill::PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
-        profile, TestPersonalDataManager::Build);
+        profile(), TestPersonalDataManager::Build);
 
-    ChromeRenderViewHostTestHarness::SetUp();
 
     autofill::TabAutofillManagerDelegate::CreateForWebContents(web_contents());
 
-    personal_data_.SetBrowserContext(profile);
+    personal_data_.SetBrowserContext(profile());
     autofill_driver_.reset(new MockAutofillDriver(web_contents()));
     autofill_manager_.reset(new TestAutofillManager(
         autofill_driver_.get(),
         autofill::TabAutofillManagerDelegate::FromWebContents(web_contents()),
         &personal_data_));
 
     external_delegate_.reset(new TestAutofillExternalDelegate(
         web_contents(),
         autofill_manager_.get(),
         autofill_driver_.get()));
     autofill_manager_->SetExternalDelegate(external_delegate_.get());
   }
 
   virtual void TearDown() OVERRIDE {
     // Order of destruction is important as AutofillManager relies on
     // PersonalDataManager to be around when it gets destroyed. Also, a real
     // AutofillManager is tied to the lifetime of the WebContents, so it must
     // be destroyed at the destruction of the WebContents.
     autofill_manager_.reset();
     autofill_driver_.reset();
     ChromeRenderViewHostTestHarness::TearDown();
 
     // Remove the BrowserContext so TestPersonalDataManager does not need to
     // care about removing self as an observer in destruction.
     personal_data_.SetBrowserContext(NULL);
   }
 
-  virtual TestingProfile* CreateProfile() {
-    return new TestingProfile();
+  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE {
+    TestingProfile* profile = new TestingProfile();
+    profile->CreateRequestContext();
+    return profile;
   }
 
   void GetAutofillSuggestions(int query_id,
                               const FormData& form,
                               const FormFieldData& field) {
     autofill_manager_->OnQueryFormFieldAutofill(query_id,
                                                 form,
                                                 field,
                                                 gfx::Rect(),
                                                 false);
@@ skipping 2480 matching lines @@
   forms.push_back(user_supplied);
 
   // FormStructure should contain the same forms as before.
   DynamicFormsSeen(forms);
   form_structures = autofill_manager_->GetFormStructures();
   ASSERT_EQ(1U, form_structures.size());
   EXPECT_EQ("/form.html", form_structures[0]->source_url().path());
 }
 
 }  // namespace autofill