Revert "Remove webkit_glue::BuildUserAgent(), change the contract in webkit_glue"

content/common/content_client.cc

Index: content/common/content_client.cc
diff --git a/content/common/content_client.cc b/content/common/content_client.cc
index 4622ce45b9607f812869637e6dccaca96588b6ef..cc2bad4677f6416418ddd65467ac01a78300d783 100644
--- a/content/common/content_client.cc
+++ b/content/common/content_client.cc
@@ -5,7 +5,6 @@
 #include "content/common/content_client.h"
 
 #include "base/string_piece.h"
-#include "webkit/glue/webkit_glue.h"
 
 namespace content {
 
@@ -13,19 +12,6 @@ static ContentClient* g_client;
 
 void SetContentClient(ContentClient* client) {
   g_client = client;
-
-  // TODO(dpranke): Doing real work (calling webkit_glue::SetUserAgent)
-  // inside what looks like a function that initializes a global is a
-  // bit odd, but we need to make sure this is done before
-  // webkit_glue::GetUserAgent() is called (so that the UA doesn't change).
-  //
-  // It would be cleaner if we could rename this to something like a
-  // content::Initialize(). Maybe we can merge this into ContentMain() somehow?
-  if (client) {
-    bool custom = false;
-    std::string ua = client->GetUserAgent(&custom);
-    webkit_glue::SetUserAgent(ua, custom);
-  }
 }
 
 ContentClient* GetContentClient() {