Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse…

content/renderer/browser_render_view_browsertest.cc

 // Copyright 2014 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.
 
 // Browser tests targeted at the RenderView that run in browser context.
 // Note that these tests rely on single-process mode, and hence may be
 // disabled in some configurations (check gyp files).
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 119 matching lines @@
   if (net::OK == cache->GetBackend(backend_ptr, backend_callback)) {
     // The call completed synchronously, so GetBackend didn't run the callback.
     backend_callback.Run(net::OK);
   }
 }
 
 }  // namespace
 
 class RenderViewBrowserTest : public ContentBrowserTest {
  public:
-  RenderViewBrowserTest() : renderer_client_(NULL) {}
+  RenderViewBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // This method is needed to allow interaction with in-process renderer
     // and use of a test ContentRendererClient.
     command_line->AppendSwitch(switches::kSingleProcess);
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUpOnMainThread() OVERRIDE {
     // Override setting of renderer client.
-    renderer_client_ = new TestShellContentRendererClient();
-    SetContentRendererClient(
-        scoped_ptr<ContentRendererClient>(renderer_client_).Pass());
-
-    ContentBrowserTest::SetUp();
+    renderer_client_.reset(new TestShellContentRendererClient());
+    SetRendererClientForTesting(renderer_client_.get());
   }
 
   // Navigates to the given URL and waits for |num_navigations| to occur, and
   // the title to change to |expected_title|.
   void NavigateToURLAndWaitForTitle(const GURL& url,
                                     const std::string& expected_title,
                                     int num_navigations) {
     content::TitleWatcher title_watcher(
         shell()->web_contents(), base::ASCIIToUTF16(expected_title));
 
     content::NavigateToURLBlockUntilNavigationsComplete(
         shell(), url, num_navigations);
 
     EXPECT_EQ(base::ASCIIToUTF16(expected_title),
               title_watcher.WaitAndGetTitle());
   }
 
   // Returns true if there is a valid error stored; in this case
   // |*error_code| and |*stale_cache_entry_present| will be updated
   // appropriately.
   // Must be called after the renderer thread is created.
   bool GetLatestErrorFromRendererClient(
       int* error_code, bool* stale_cache_entry_present) {
     bool result = false;
 
     PostTaskToInProcessRendererAndWait(
         base::Bind(&RenderViewBrowserTest::GetLatestErrorFromRendererClient0,
-                   renderer_client_, &result, error_code,
+                   renderer_client_.get(), &result, error_code,
                    stale_cache_entry_present));
     return result;
   }
 
  private:
   // Must be run on renderer thread.
   static void GetLatestErrorFromRendererClient0(
       TestShellContentRendererClient* renderer_client,
       bool* result, int* error_code, bool* stale_cache_entry_present) {
     *result = renderer_client->GetLatestError(
         error_code, stale_cache_entry_present);
   }
 
-  // Actually owned by the superclass, so safe to keep a bare pointer.
-  TestShellContentRendererClient* renderer_client_;
+  scoped_ptr<TestShellContentRendererClient> renderer_client_;
 };
 
 #if defined(OS_ANDROID)
 // Flaky https://crbug.com/341745
 #define MAYBE_ConfirmCacheInformationPlumbed DISABLED_ConfirmCacheInformationPlumbed
 #else
 #define MAYBE_ConfirmCacheInformationPlumbed ConfirmCacheInformationPlumbed
 #endif
 
 IN_PROC_BROWSER_TEST_F(RenderViewBrowserTest,
@@ skipping 37 matching lines @@
 
   error_code = net::OK;
   stale_cache_entry_present = true;
   ASSERT_TRUE(GetLatestErrorFromRendererClient(
       &error_code, &stale_cache_entry_present));
   EXPECT_EQ(net::ERR_FAILED, error_code);
   EXPECT_FALSE(stale_cache_entry_present);
 }
 
 }  // namespace content