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

trunk/src/content/public/common/content_client.cc

Index: trunk/src/content/public/common/content_client.cc
===================================================================
--- trunk/src/content/public/common/content_client.cc	(revision 255866)
+++ trunk/src/content/public/common/content_client.cc	(working copy)
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "ui/gfx/image/image.h"
+#include "webkit/common/user_agent/user_agent.h"
 
 namespace content {
 
@@ -35,6 +36,12 @@
 
 void SetContentClient(ContentClient* client) {
   g_client = client;
+
+  // Set the default user agent as provided by the client. We need to make
+  // sure this is done before webkit_glue::GetUserAgent() is called (so that
+  // the UA doesn't change).
+  if (client)
+    webkit_glue::SetUserAgent(client->GetUserAgent());
 }
 
 ContentClient* GetContentClient() {
@@ -53,6 +60,11 @@
   return InternalTestInitializer::SetUtility(u);
 }
 
+const std::string& GetUserAgent(const GURL& url) {
+  DCHECK(g_client);
+  return webkit_glue::GetUserAgent(url);
+}
+
 ContentClient::ContentClient()
     : browser_(NULL), plugin_(NULL), renderer_(NULL), utility_(NULL) {
 }