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

chrome/test/base/chrome_test_suite.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/test/base/chrome_test_suite.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/stats_table.h"
@@ skipping 87 matching lines @@
   ChromeTestSuiteInitializer() {
   }
 
   virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
     DCHECK(!g_browser_process);
     g_browser_process = new TestingBrowserProcess;
 
     DCHECK(!content::GetContentClient());
     content_client_.reset(new chrome::ChromeContentClient);
     browser_content_client_.reset(new chrome::ChromeContentBrowserClient());
-    content_client_->set_browser(browser_content_client_.get());
+    content_client_->set_browser_for_testing(browser_content_client_.get());
     content::SetContentClient(content_client_.get());
 
     SetUpHostResolver();
   }
 
   virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
     if (g_browser_process) {
       delete g_browser_process;
       g_browser_process = NULL;
     }
@@ skipping 94 matching lines @@
 #if defined(OS_MACOSX)
   base::mac::SetOverrideFrameworkBundle(NULL);
 #endif
 
   base::StatsTable::set_current(NULL);
   stats_table_.reset();
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }