Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

content/public/common/content_client.cc

Index: content/public/common/content_client.cc
===================================================================
--- content/public/common/content_client.cc	(revision 192622)
+++ content/public/common/content_client.cc	(working copy)
@@ -17,6 +17,21 @@
 
 static ContentClient* g_client;
 
+class InternalTestInitializer {
+ public:
+  static ContentBrowserClient* SetBrowser(ContentBrowserClient* b) {
+    ContentBrowserClient* rv = g_client->browser_;
+    g_client->browser_ = b;
+    return rv;
+  }
+
+  static ContentRendererClient* SetRenderer(ContentRendererClient* r) {
+    ContentRendererClient* rv = g_client->renderer_;
+    g_client->renderer_ = r;
+    return rv;
+  }
+};
+
 void SetContentClient(ContentClient* client) {
   g_client = client;
 
@@ -32,6 +47,14 @@
   return g_client;
 }
 
+ContentBrowserClient* SetBrowserClientForTesting(ContentBrowserClient* b) {
+  return InternalTestInitializer::SetBrowser(b);
+}
+
+ContentRendererClient* SetRendererClientForTesting(ContentRendererClient* r) {
+  return InternalTestInitializer::SetRenderer(r);
+}
+
 const std::string& GetUserAgent(const GURL& url) {
   DCHECK(g_client);
   return webkit_glue::GetUserAgent(url);