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

chrome/common/chrome_content_client.h

Index: chrome/common/chrome_content_client.h
diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
index 5f069f309035b3632c856bbc53de0d4a1cb7a7b3..a4bb24279d7c55a2d155753c09b0c4a794965eb7 100644
--- a/chrome/common/chrome_content_client.h
+++ b/chrome/common/chrome_content_client.h
@@ -6,7 +6,6 @@
 #define CHROME_COMMON_CHROME_CONTENT_CLIENT_H_
 #pragma once
 
-#include "base/compiler_specific.h"
 #include "content/common/content_client.h"
 
 namespace chrome {
@@ -17,19 +16,18 @@ class ChromeContentClient : public content::ContentClient {
   static const char* const kNaClPluginName;
   static const char* const kNaClOldPluginName;
 
-  virtual void SetActiveURL(const GURL& url) OVERRIDE;
-  virtual void SetGpuInfo(const GPUInfo& gpu_info) OVERRIDE;
-  virtual void AddPepperPlugins(
-      std::vector<PepperPluginInfo>* plugins) OVERRIDE;
-  virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) OVERRIDE;
-  virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
-  virtual std::string GetUserAgent(bool* overriding) const OVERRIDE;
-  virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
-  virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE;
+  virtual void SetActiveURL(const GURL& url);
+  virtual void SetGpuInfo(const GPUInfo& gpu_info);
+  virtual void AddPepperPlugins(std::vector<PepperPluginInfo>* plugins);
+  virtual bool CanSendWhileSwappedOut(const IPC::Message* msg);
+  virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg);
+  virtual std::string GetUserAgent(bool mimic_windows) const;
+  virtual string16 GetLocalizedString(int message_id) const;
+  virtual base::StringPiece GetDataResource(int resource_id) const;
 
 #if defined(OS_WIN)
   virtual bool SandboxPlugin(CommandLine* command_line,
-                             sandbox::TargetPolicy* policy) OVERRIDE;
+                             sandbox::TargetPolicy* policy);
 #endif
 };