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

content/shell/renderer/shell_content_renderer_client.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 "content/shell/renderer/shell_content_renderer_client.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "content/public/common/content_constants.h"
@@ skipping 25 matching lines @@
 using blink::WebPluginParams;
 using blink::WebRTCPeerConnectionHandler;
 using blink::WebRTCPeerConnectionHandlerClient;
 using blink::WebThemeEngine;
 using WebTestRunner::WebTestDelegate;
 using WebTestRunner::WebTestInterfaces;
 using WebTestRunner::WebTestProxyBase;
 
 namespace content {
 
-namespace {
-ShellContentRendererClient* g_renderer_client;
-}
-
-ShellContentRendererClient* ShellContentRendererClient::Get() {
-  return g_renderer_client;
-}
-
 ShellContentRendererClient::ShellContentRendererClient() {
-  DCHECK(!g_renderer_client);
-  g_renderer_client = this;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) {
     EnableWebTestProxyCreation(
         base::Bind(&ShellContentRendererClient::WebTestProxyCreated,
                    base::Unretained(this)));
   }
 }
 
 ShellContentRendererClient::~ShellContentRendererClient() {
-  g_renderer_client = NULL;
 }
 
 void ShellContentRendererClient::RenderThreadStarted() {
   shell_observer_.reset(new ShellRenderProcessObserver());
 #if defined(OS_MACOSX)
   // We need to call this once before the sandbox was initialized to cache the
   // value.
   base::debug::BeingDebugged();
 #endif
 }
@@ skipping 108 matching lines @@
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableBrowserPluginForAllViewTypes)) {
     // Allow BrowserPlugin if forced by command line flag. This is generally
     // true for tests.
     return true;
   }
   return ContentRendererClient::AllowBrowserPlugin(container);
 }
 
 }  // namespace content