Move user_agent code from webkit/ to content/.

content/public/common/content_client.cc

 // 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.
 
 #include "content/public/common/content_client.h"
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
+#include "content/public/common/user_agent.h"
 #include "ui/gfx/image/image.h"
-#include "webkit/common/user_agent/user_agent.h"
 
 namespace content {
 
 static ContentClient* g_client;
 
 class InternalTestInitializer {
  public:
   static ContentBrowserClient* SetBrowser(ContentBrowserClient* b) {
     ContentBrowserClient* rv = g_client->browser_;
     g_client->browser_ = b;
@@ skipping 10 matching lines @@
     ContentUtilityClient* rv = g_client->utility_;
     g_client->utility_ = u;
     return rv;
   }
 };
 
 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).
+  // sure this is done before GetUserAgent() is called (so that the UA doesn't
+  // change).
   if (client) {
-    webkit_glue::SetUserAgent(client->GetUserAgent(), false);
+    SetUserAgent(client->GetUserAgent(), false);

[jam, 2014/03/04 20:49:45]

this isn't needed anymore either since the user agent code is now in
content/common. so it can call content::GetContentClient()->GetUserAgent()
lazily the first time it's needed

[tfarina, 2014/03/04 22:07:20]

Done.

   }
 }
 
 ContentClient* GetContentClient() {
   return g_client;
 }
 
 ContentBrowserClient* SetBrowserClientForTesting(ContentBrowserClient* b) {
   return InternalTestInitializer::SetBrowser(b);
 }
@@ skipping 65 matching lines @@
     int* sandbox_profile_resource_id) const {
   return false;
 }
 
 std::string ContentClient::GetCarbonInterposePath() const {
   return std::string();
 }
 #endif
 
 }  // namespace content