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

content/test/test_content_client_initializer.cc

Index: content/test/test_content_client_initializer.cc
===================================================================
--- content/test/test_content_client_initializer.cc	(revision 140381)
+++ content/test/test_content_client_initializer.cc	(working copy)
@@ -4,10 +4,10 @@
 
 #include "content/public/test/test_content_client_initializer.h"
 
-#include "content/browser/mock_content_browser_client.h"
 #include "content/browser/notification_service_impl.h"
 #include "content/public/common/content_client.h"
 #include "content/public/test/mock_render_process_host.h"
+#include "content/test/test_content_browser_client.h"
 #include "content/test/test_content_client.h"
 #include "content/test/test_render_view_host_factory.h"
 
@@ -20,8 +20,8 @@
   content_client_.reset(new TestContentClient);
   SetContentClient(content_client_.get());
 
-  content_browser_client_.reset(new MockContentBrowserClient());
-  content_client_->set_browser(content_browser_client_.get());
+  content_browser_client_.reset(new TestContentBrowserClient());
+  content_client_->set_browser_for_testing(content_browser_client_.get());
 }
 
 TestContentClientInitializer::~TestContentClientInitializer() {