Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

chrome_frame/test/net/fake_external_tab.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 "chrome_frame/test/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 #include <Winsock2.h>
@@ skipping 129 matching lines @@
     g_renderer_client = LAZY_INSTANCE_INITIALIZER;
 
 class FakeMainDelegate : public content::ContentMainDelegate {
  public:
   virtual ~FakeMainDelegate() {}
 
   virtual bool BasicStartupComplete(int* exit_code) OVERRIDE {
     logging_win::InstallTestLogCollector(
         testing::UnitTest::GetInstance());
 
-    // Initialize the content client.
     content::SetContentClient(&g_chrome_content_client.Get());
-
-    // Override the default ContentBrowserClient to let Chrome participate in
-    // content logic.  We use a subclass of Chrome's implementation,
-    // FakeContentBrowserClient, to override CreateBrowserMainParts.  Must
-    // be done before any tabs are created.
-    content::GetContentClient()->set_browser(&g_browser_client.Get());
-    content::GetContentClient()->set_renderer(&g_renderer_client.Get());
+    content::GetContentClient()->set_renderer_for_testing(
+        &g_renderer_client.Get());
     return false;
   }
+
+  // Override the default ContentBrowserClient to let Chrome participate in
+  // content logic.  We use a subclass of Chrome's implementation,
+  // FakeContentBrowserClient, to override CreateBrowserMainParts.  Must
+  // be done before any tabs are created.
+  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE {
+    return &g_browser_client.Get();
+  };
 };
 
 void FilterDisabledTests() {
   if (::testing::FLAGS_gtest_filter.length() &&
       ::testing::FLAGS_gtest_filter.Compare("*") != 0) {
     // Don't override user specified filters.
     return;
   }
 
   const char* disabled_tests[] = {
@@ skipping 717 matching lines @@
   // content::InitializeSandboxInfo(&sandbox_info);
   FakeMainDelegate delegate;
   content::ContentMain(
       reinterpret_cast<HINSTANCE>(GetModuleHandle(NULL)),
       &sandbox_info,
       &delegate);
 
   // Note:  In debug builds, we ExitProcess during PostDestroyThreads.
   return g_test_suite->test_result();
 }