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"

[jam, 2014/03/05 00:09:26]

nit: not needed

[tfarina, 2014/03/05 00:42:52]

Done.

 #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;
     return rv;
   }
 
   static ContentRendererClient* SetRenderer(ContentRendererClient* r) {
     ContentRendererClient* rv = g_client->renderer_;
     g_client->renderer_ = r;
     return rv;
   }
 
   static ContentUtilityClient* SetUtility(ContentUtilityClient* u) {
     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).
-  if (client) {
-    webkit_glue::SetUserAgent(client->GetUserAgent(), false);

[jam, 2014/03/05 00:09:26]

i don't see any code which now calls ContentClient->GetUserAgent(). that still
needs to happen. it should just be lazily initialized in user_agent.cc's
GetUserAgent, i.e. a custom constructor for the lazy instance

[tfarina, 2014/03/05 00:22:11]

https://code.google.com/p/chromium/codesearch#search/&q=%22-%3Egetuseragent(%...

https://code.google.com/p/chromium/codesearch#search/&q=%22.getuseragent(%22&...

So looks like we have one in chrome_content_client_unittest.cc, one in
content/browser/accessibility/browser_accessibility_win.cc and this one here in
content_client.cc

I'm afraid that I'm unsure which change you want in user_agent.cc :(

[jam, 2014/03/05 08:34:56]

sorry I wasn't clear. I mean, user_agent.cc needs to call the equivalent of
SetUserAgent(content::GetContentClient()->GetUserAgent()) because otherwise the
user agent string from the embedder is never fetched by content itself for the
lazy instance. is that clearer?

btw looking at this some more, I think we can really simplify the user agent
code. The reason is that the microsoft/yahoo user agent changing code was there
for the first release. it's not needed anymore. the microsoft silverlight
download page still shows a download without that user agent override. the yahoo
downloads page for silverlight says that site will go away in june. The yahoo
gyao.yahoo.co.jp page doesn't have silverlight on it now.
promotion.shopping.yahoo.co.jp is dead.

[tfarina, 2014/03/05 13:31:55]

Sorry, I have no idea what you are asking me to do in user_agent.cc :(

-  }
 }
 
 ContentClient* GetContentClient() {
   return g_client;
 }
 
 ContentBrowserClient* SetBrowserClientForTesting(ContentBrowserClient* b) {
   return InternalTestInitializer::SetBrowser(b);
 }
 
 ContentRendererClient* SetRendererClientForTesting(ContentRendererClient* r) {
   return InternalTestInitializer::SetRenderer(r);
 }
 
 ContentUtilityClient* SetUtilityClientForTesting(ContentUtilityClient* u) {
   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) {
 }
 
 ContentClient::~ContentClient() {
 }
 
 bool ContentClient::CanSendWhileSwappedOut(const IPC::Message* message) {
   return false;
 }
@@ skipping 41 matching lines @@
     int* sandbox_profile_resource_id) const {
   return false;
 }
 
 std::string ContentClient::GetCarbonInterposePath() const {
   return std::string();
 }
 #endif
 
 }  // namespace content