1 files changed, 25 insertions, 10 deletions
diff --git a/chrome/browser/browser_main_unittest.cc b/chrome/browser/browser_main_unittest.cc
index f14e5b2..5d609d85 100644
--- a/chrome/browser/browser_main_unittest.cc
+++ b/chrome/browser/browser_main_unittest.cc
@@ -7,8 +7,11 @@
 #include <string>
 #include <vector>
 #include "base/command_line.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service.h"
+#include "content/browser/content_browser_client.h"
 #include "content/common/main_function_params.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "net/socket/client_socket_pool_base.h"
@@ -32,10 +35,12 @@ TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) {
 
   scoped_ptr<MainFunctionParams> params(
       new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL));
-  scoped_ptr<BrowserMainParts> bw(BrowserMainParts::CreateBrowserMainParts(
-      *params));
+  scoped_ptr<content::BrowserMainParts> bw(
+      content::GetContentClient()->browser()->CreateBrowserMainParts(
+          *params));
 
-  bw->WarmConnectionFieldTrial();
+  ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
+  cbw->WarmConnectionFieldTrial();
 
   EXPECT_EQ(0, net::GetSocketReusePolicy());
 }
@@ -43,12 +48,14 @@ TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) {
 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Random) {
   scoped_ptr<MainFunctionParams> params(
       new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL));
-  scoped_ptr<BrowserMainParts> bw(BrowserMainParts::CreateBrowserMainParts(
-      *params));
+  scoped_ptr<content::BrowserMainParts> bw(
+      content::GetContentClient()->browser()->CreateBrowserMainParts(
+          *params));
+  ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
 
   const int kNumRuns = 1000;
   for (int i = 0; i < kNumRuns; i++) {
-    bw->WarmConnectionFieldTrial();
+    cbw->WarmConnectionFieldTrial();
     int val = net::GetSocketReusePolicy();
     EXPECT_LE(val, 2);
     EXPECT_GE(val, 0);
@@ -60,9 +67,17 @@ TEST_F(BrowserMainTest, WarmConnectionFieldTrial_Invalid) {
 
   scoped_ptr<MainFunctionParams> params(
       new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL));
-  scoped_ptr<BrowserMainParts> bw(BrowserMainParts::CreateBrowserMainParts(
-      *params));
-
-  EXPECT_DEBUG_DEATH(bw->WarmConnectionFieldTrial(),
+  // This test ends up launching a new process, and that doesn't initialize the
+  // ContentClient interfaces.
+  scoped_ptr<content::BrowserMainParts> bw;
+  if (content::GetContentClient()) {
+    bw.reset(content::GetContentClient()->browser()->CreateBrowserMainParts(
+        *params));
+  } else {
+    chrome::ChromeContentBrowserClient ccbc;
+    bw.reset(ccbc.CreateBrowserMainParts(*params));
+  }
+  ChromeBrowserMainParts* cbw = static_cast<ChromeBrowserMainParts*>(bw.get());
+  EXPECT_DEBUG_DEATH(cbw->WarmConnectionFieldTrial(),
                      "Not a valid socket reuse policy group");
 }