update user agent

chrome/browser/chrome_content_browser_client_unittest.cc

@@ -242,7 +242,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) {
   EXPECT_EQ(webkit_version_str, safari_version_str);
 
   EXPECT_TRUE(
-      base::StartsWith(product_str, "Tangled/", base::CompareCase::SENSITIVE));
+      base::StartsWith(product_str, "Chromium/", base::CompareCase::SENSITIVE));
   if (mobile_device) {
     // "Mobile" gets tacked on to the end for mobile devices, like phones.
     EXPECT_TRUE(

chrome/browser/sessions/tab_restore_service_unittest.cc

@@ -82,7 +82,7 @@ class TabRestoreServiceImplTest : public ChromeRenderViewHostTestHarness {
         url3_("http://3"),
         user_agent_override_(blink::UserAgentOverride::UserAgentOnly(
             "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19"
-            " (KHTML, like Gecko) Tangled/18.0.1025.45 Safari/535.19")),
+            " (KHTML, like Gecko) Chromium/18.0.1025.45 Tangled/18.0.1025.45 Safari/535.19")),
         time_factory_(nullptr),
         window_id_(SessionID::FromSerializedValue(1)),
         tab_id_(SessionID::FromSerializedValue(2)) {

components/version_info/version_info.cc

@@ -18,7 +18,7 @@
 namespace version_info {
 
 std::string GetProductNameAndVersionForUserAgent() {
-  return "Tangled/" + GetVersionNumber();
+  return "Chrome/" + GetVersionNumber();
 }
 
 std::string GetProductName() {

content/common/user_agent.cc

@@ -296,15 +296,18 @@ std::string BuildUserAgentFromOSAndProduct(const std::string& os_info,
   // This is done to expose our product name in a manner that is maximally
   // compatible with Safari, we hope!!
   std::string user_agent;
+  std::string tangled = product;
+  base::ReplaceFirstSubstringAfterOffset(&tangled, 0, "Chrome", "Tangled");
   base::StringAppendF(
       &user_agent,
-      "Mozilla/5.0 (%s) AppleWebKit/%d.%d (KHTML, like Gecko) %s Safari/%d.%d",
+      "Mozilla/5.0 (%s) AppleWebKit/%d.%d (KHTML, like Gecko) %s Safari/%d.%d %s",
       os_info.c_str(),
       WEBKIT_VERSION_MAJOR,
       WEBKIT_VERSION_MINOR,
       product.c_str(),
       WEBKIT_VERSION_MAJOR,
-      WEBKIT_VERSION_MINOR);
+      WEBKIT_VERSION_MINOR,
+      tangled.c_str());
   return user_agent;
 }