Change RenderViewHostTestHarness to create BrowserContext after thread startup

content/public/test/test_renderer_host.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 #define CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 138 matching lines @@
 
   // Simulates a reload of the current page.
   void Reload();
   void FailedReload();
 
  protected:
   // testing::Test
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
+  // Derived classes should override this method to use a custom BrowserContext.
+  // It is invoked by SetUp after threads were started.
+  // RenderViewHostTestHarness will take ownership of the returned
+  // BrowserContext.
+  virtual BrowserContext* CreateBrowserContext();
+
   // Configures which TestBrowserThreads inside |thread_bundle| are backed by
   // real threads. Must be called before SetUp().
   void SetThreadBundleOptions(int options) {
     DCHECK(thread_bundle_.get() == NULL);
     thread_bundle_options_ = options;
   }
 
   TestBrowserThreadBundle* thread_bundle() { return thread_bundle_.get(); }
 
 #if defined(USE_AURA)
   aura::RootWindow* root_window() { return aura_test_helper_->root_window(); }
 #endif
 
   // Replaces the RPH being used.
   void SetRenderProcessHostFactory(RenderProcessHostFactory* factory);
 
-  // This browser context will be created in SetUp if it has not already been
-  // created.  This allows tests to override the browser context if they so
-  // choose in their own SetUp function before calling the base class's (us)
-  // SetUp().
+ private:
   scoped_ptr<BrowserContext> browser_context_;
 
- private:
   // It is important not to use this directly in the implementation as
   // web_contents() and SetContents() are virtual and may be
   // overridden by subclasses.
   scoped_ptr<WebContents> contents_;
 #if defined(OS_WIN)
   scoped_ptr<ui::ScopedOleInitializer> ole_initializer_;
 #endif
 #if defined(USE_AURA)
   scoped_ptr<aura::test::AuraTestHelper> aura_test_helper_;
 #endif
   RenderViewHostTestEnabler rvh_test_enabler_;
 
   int thread_bundle_options_;
   scoped_ptr<TestBrowserThreadBundle> thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_TEST_TEST_RENDERER_HOST_H_