Change RenderViewHostTestHarness to create BrowserContext after thread startup

content/browser/web_contents/web_contents_impl_unittest.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/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/frame_tree_node.h"
@@ skipping 544 matching lines @@
   SiteInstance* instance1 = contents()->GetSiteInstance();
 
   // Navigate to URL.  First URL should use first RenderViewHost.
   const GURL url("http://www.google.com");
   controller().LoadURL(
       url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);
 
   // Open a new contents with the same SiteInstance, navigated to the same site.
   scoped_ptr<TestWebContents> contents2(
-      TestWebContents::Create(browser_context_.get(), instance1));
+      TestWebContents::Create(browser_context(), instance1));
   contents2->transition_cross_site = true;
   contents2->GetController().LoadURL(url, Referrer(),
                                     PAGE_TRANSITION_TYPED,
                                     std::string());
   // Need this page id to be 2 since the site instance is the same (which is the
   // scope of page IDs) and we want to consider this a new page.
   contents2->TestDidNavigate(
       contents2->GetRenderViewHost(), 2, url, PAGE_TRANSITION_TYPED);
 
   // Navigate first contents to a new site.
@@ skipping 159 matching lines @@
 
   // Navigate to URL.
   const GURL url("http://www.google.com");
   controller().LoadURL(
       url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(
       orig_rvh, 1, url, PAGE_TRANSITION_TYPED);
 
   // Open a related contents to a second site.
   scoped_ptr<TestWebContents> contents2(
-      TestWebContents::Create(browser_context_.get(), instance1));
+      TestWebContents::Create(browser_context(), instance1));
   contents2->transition_cross_site = true;
   const GURL url2("http://www.yahoo.com");
   contents2->GetController().LoadURL(url2, Referrer(),
                                     PAGE_TRANSITION_TYPED,
                                     std::string());
   // The first RVH in contents2 isn't live yet, so we shortcut the cross site
   // pending.
   TestRenderViewHost* rvh2 = static_cast<TestRenderViewHost*>(
       contents2->GetRenderViewHost());
   EXPECT_FALSE(contents2->cross_navigation_pending());
@@ skipping 1462 matching lines @@
   EXPECT_EQ(0UL, deep_tree->child_at(0)->child_at(0)->child_count());
 
   contents()->OnFrameDetached(16, 265);
   EXPECT_EQ(4UL, root->child_at(2)->child_count());
 
   contents()->OnFrameDetached(5, 15);
   EXPECT_EQ(2UL, root->child_count());
 }
 
 }  // namespace content