Move --user-agent overriding logic from chrome into content.

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_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 28 matching lines @@
 namespace content {
 
 class ContentBrowserClient;
 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);
+// Initializes the browser with a client and user agent string. This method
+// should be called early on before any other content code is called.
+CONTENT_EXPORT void Initialize(ContentClient* client,
+                               const std::string& user_agent);
+
+// Uninitializes the browser by removing its reference to the client and
+// resetting the user agent.
+CONTENT_EXPORT void Uninitialize();
+
+// Returns the client being used by the browser. Initialize() must be called
+// prior to calling this method.
 CONTENT_EXPORT ContentClient* GetContentClient();
 
-// 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.
+// Returns the user agent string being used by the browser. Initialize() must
+// be called prior to calling this method.
+//
+// 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);
 
 // Returns the PPAPI global singleton. See webkit/plugins/ppapi/host_globals.h
 // TODO(dpranke): Also needed since webkit_glue is a library.
 CONTENT_EXPORT webkit::ppapi::HostGlobals* GetHostGlobals();
 
@@ skipping 27 matching lines @@
       webkit::npapi::PluginList* plugin_list) = 0;
 
   // Returns true if the url has a scheme for WebUI.  See also
   // WebUIControllerFactory::UseWebUIForURL in the browser process.
   virtual bool HasWebUIScheme(const GURL& url) const = 0;
 
   // Returns whether the given message should be processed in the browser on
   // behalf of a swapped out renderer.
   virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) = 0;
 
-  // Returns the user agent and a flag indicating whether the returned
-  // string should always be used (if false, callers may override the
-  // value as needed to work around various user agent sniffing bugs).
-  virtual std::string GetUserAgent(bool *overriding) const = 0;
-
   // Returns a string resource given its id.
   virtual string16 GetLocalizedString(int message_id) const = 0;
 
   // Return the contents of a resource in a StringPiece given the resource id.
   virtual base::StringPiece GetDataResource(int resource_id) const = 0;
 
 #if defined(OS_WIN)
   // Allows the embedder to sandbox a plugin, and apply a custom policy.
   virtual bool SandboxPlugin(CommandLine* command_line,
                              sandbox::TargetPolicy* policy) = 0;
@@ skipping 19 matching lines @@
   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_