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

content/public/common/content_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
 class ContentClient;
 class ContentPluginClient;
 class ContentRendererClient;
 class ContentUtilityClient;
 struct GPUInfo;
 struct PepperPluginInfo;
 
 // Setter and getter for the client.  The client should be set early, before any
 // content code is called.
 CONTENT_EXPORT void SetContentClient(ContentClient* client);
-CONTENT_EXPORT ContentClient* GetContentClient();
+
+#if defined(CONTENT_IMPLEMENTATION)
+// Content's embedder API should only be used by content.
+ContentClient* GetContentClient();
+#endif
+
+// Used for tests to override the relevant embedder interfaces. Each method
+// returns the old value.
+CONTENT_EXPORT ContentBrowserClient* SetBrowserClientForTesting(
+    ContentBrowserClient* b);
+CONTENT_EXPORT ContentRendererClient* SetRendererClientForTesting(
+    ContentRendererClient* r);
 
 // Returns the user agent string being used by the browser. SetContentClient()
 // must be called prior to calling this, and this routine must be used
 // instead of webkit_glue::GetUserAgent() in order to ensure that we use
 // the same user agent string everywhere.
 // TODO(dpranke): This is caused by webkit_glue being a library that can
 // get linked into multiple linkable objects, causing us to have multiple
 // static values of the user agent. This will be fixed when we clean up
 // webkit_glue.
 CONTENT_EXPORT const std::string& GetUserAgent(const GURL& url);
@@ skipping 76 matching lines @@
   // the sandbox profile to use and true is returned.
   virtual bool GetSandboxProfileForSandboxType(
       int sandbox_type,
       int* sandbox_profile_resource_id) const;
 
   // Gets the Carbon interposing path to give to DYLD. Returns an empty string
   // if the embedder doesn't bundle it.
   virtual std::string GetCarbonInterposePath() const;
 #endif
 
-  void set_browser_for_testing(ContentBrowserClient* c) { browser_ = c; }
-  void set_renderer_for_testing(ContentRendererClient* r) { renderer_ = r; }
-
  private:
   friend class ContentClientInitializer;  // To set these pointers.
+  friend class InternalTestInitializer;
 
   // The embedder API for participating in browser logic.
   ContentBrowserClient* browser_;
   // The embedder API for participating in plugin logic.
   ContentPluginClient* plugin_;
   // The embedder API for participating in renderer logic.
   ContentRendererClient* renderer_;
   // The embedder API for participating in utility logic.
   ContentUtilityClient* utility_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_