Remove the hotmail UA spoofing hack....

webkit/glue/webkit_glue.cc

 // Copyright (c) 2006-2009 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 "config.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
@@ skipping 276 matching lines @@
 
 namespace {
 
 struct UserAgentState {
   UserAgentState()
       : user_agent_requested(false),
         user_agent_is_overridden(false) {
   }
 
   std::string user_agent;
-  std::string mimic_safari_user_agent;
   bool user_agent_requested;
   bool user_agent_is_overridden;
 };
 
 Singleton<UserAgentState> g_user_agent;
 
 std::string BuildOSCpuInfo() {
   std::string os_cpu;
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
@@ skipping 39 matching lines @@
 #else
       "%s %s",
       unixinfo.sysname, // e.g. Linux
       cputype.c_str()   // e.g. i686
 #endif
   );
 
   return os_cpu;
 }
 
-void BuildUserAgent(bool mimic_safari, std::string* result) {
+void BuildUserAgent(std::string* result) {
   const char kUserAgentPlatform[] =
 #if defined(OS_WIN)
       "Windows";
 #elif defined(OS_MACOSX)
       "Macintosh";
 #elif defined(OS_LINUX)
       "X11";              // strange, but that's what Firefox uses
 #else
       "?";
 #endif
 
   const char kUserAgentSecurity = 'U'; // "US" strength encryption
 
   // TODO(port): figure out correct locale
   const char kUserAgentLocale[] = "en-US";
 
   // Get the product name and version, and replace Safari's Version/X string
   // with it.  This is done to expose our product name in a manner that is
   // maximally compatible with Safari, we hope!!
   std::string product;
 
-  if (!mimic_safari) {
-    scoped_ptr<FileVersionInfo> version_info(
-        FileVersionInfo::CreateFileVersionInfoForCurrentModule());
-    if (version_info.get())
-      product = "Chrome/" + WideToASCII(version_info->product_version());
+  scoped_ptr<FileVersionInfo> version_info(
+      FileVersionInfo::CreateFileVersionInfoForCurrentModule());
+  if (version_info.get()) {
+    product = "Chrome/" + WideToASCII(version_info->product_version());
+  } else {
+    DLOG(WARNING) << "Unknown product version";
+    product = "Chrome/0.0.0.0";
   }
 
-  if (product.empty())
-    product = "Version/3.2.1";
-
   // Derived from Safari's UA string.
   StringAppendF(
       result,
       "Mozilla/5.0 (%s; %c; %s; %s) AppleWebKit/%d.%d"
       " (KHTML, like Gecko) %s Safari/%d.%d",
       kUserAgentPlatform,
       kUserAgentSecurity,
       BuildOSCpuInfo().c_str(),
       kUserAgentLocale,
       WEBKIT_VERSION_MAJOR,
@@ skipping 17 matching lines @@
       "Setting the user agent after someone has "
       "already requested it can result in unexpected behavior.";
   g_user_agent->user_agent_is_overridden = true;
   g_user_agent->user_agent = new_user_agent;
 }
 
 const std::string& GetUserAgent(const GURL& url) {
   if (g_user_agent->user_agent.empty())
     SetUserAgentToDefault();
   g_user_agent->user_agent_requested = true;
-  if (!g_user_agent->user_agent_is_overridden) {
-    // For hotmail, we need to spoof as Safari (bug 4111).
-    if (MatchPattern(url.host(), "*.mail.live.com")) {
-      if (g_user_agent->mimic_safari_user_agent.empty())
-        BuildUserAgent(true, &g_user_agent->mimic_safari_user_agent);
-      return g_user_agent->mimic_safari_user_agent;
-    }
-  }
   return g_user_agent->user_agent;
 }
 
 void SetForcefullyTerminatePluginProcess(bool value) {
   if (IsPluginRunningInRendererProcess()) {
     // Ignore this quirk when the plugins are not running in their own process.
     return;
   }
 
   g_forcefully_terminate_plugin_process = value;
 }
 
 bool ShouldForcefullyTerminatePluginProcess() {
   return g_forcefully_terminate_plugin_process;
 }
 
 WebCanvas* ToWebCanvas(skia::PlatformCanvas* canvas) {
 #if WEBKIT_USING_SKIA
   return canvas;
 #elif WEBKIT_USING_CG
   return canvas->getTopPlatformDevice().GetBitmapContext();
 #else
   NOTIMPLEMENTED();
   return NULL;
 #endif
 }
 
 } // namespace webkit_glue