Revert 255858 "Simplify the user agent code some more since afte..."

trunk/src/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 47 matching lines @@
 
 // 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);
 CONTENT_EXPORT ContentUtilityClient* SetUtilityClientForTesting(
     ContentUtilityClient* u);
 
+// 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);
+
 // Interface that the embedder implements.
 class CONTENT_EXPORT ContentClient {
  public:
   ContentClient();
   virtual ~ContentClient();
 
   ContentBrowserClient* browser() { return browser_; }
   ContentPluginClient* plugin() { return plugin_; }
   ContentRendererClient* renderer() { return renderer_; }
   ContentUtilityClient* utility() { return utility_; }
@@ skipping 75 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_