Revert 255858 "Simplify the user agent code some more since afte..."

trunk/src/components/autofill/content/browser/risk/fingerprint.cc

Index: trunk/src/components/autofill/content/browser/risk/fingerprint.cc
===================================================================
--- trunk/src/components/autofill/content/browser/risk/fingerprint.cc	(revision 255866)
+++ trunk/src/components/autofill/content/browser/risk/fingerprint.cc	(working copy)
@@ -263,7 +263,6 @@
       const std::string& accept_languages,
       const base::Time& install_time,
       const std::string& app_locale,
-      const std::string& user_agent,
       const base::TimeDelta& timeout,
       const base::Callback<void(scoped_ptr<Fingerprint>)>& callback);
 
@@ -302,8 +301,6 @@
   const std::string version_;
   const std::string charset_;
   const std::string accept_languages_;
-  const std::string app_locale_;
-  const std::string user_agent_;
   const base::Time install_time_;
 
   // Data that will be loaded asynchronously.
@@ -320,6 +317,9 @@
   // instance is destroyed.
   base::WeakPtrFactory<FingerprintDataLoader> weak_ptr_factory_;
 
+  // The current application locale.
+  std::string app_locale_;
+
   // The callback that will be called once all the data is available.
   base::Callback<void(scoped_ptr<Fingerprint>)> callback_;
 
@@ -336,7 +336,6 @@
     const std::string& accept_languages,
     const base::Time& install_time,
     const std::string& app_locale,
-    const std::string& user_agent,
     const base::TimeDelta& timeout,
     const base::Callback<void(scoped_ptr<Fingerprint>)>& callback)
     : gpu_data_manager_(content::GpuDataManager::GetInstance()),
@@ -348,8 +347,6 @@
       version_(version),
       charset_(charset),
       accept_languages_(accept_languages),
-      app_locale_(app_locale),
-      user_agent_(user_agent),
       install_time_(install_time),
       waiting_on_plugins_(true),
       weak_ptr_factory_(this),
@@ -448,7 +445,7 @@
   machine->set_utc_offset_ms(GetTimezoneOffset().InMilliseconds());
   machine->set_browser_language(app_locale_);
   machine->set_charset(charset_);
-  machine->set_user_agent(user_agent_);
+  machine->set_user_agent(content::GetUserAgent(GURL()));
   machine->set_ram(base::SysInfo::AmountOfPhysicalMemory());
   machine->set_browser_build(version_);
   machine->set_browser_feature(
@@ -514,15 +511,13 @@
     const std::string& accept_languages,
     const base::Time& install_time,
     const std::string& app_locale,
-    const std::string& user_agent,
     const base::TimeDelta& timeout,
     const base::Callback<void(scoped_ptr<Fingerprint>)>& callback) {
   // Begin loading all of the data that we need to load asynchronously.
   // This class is responsible for freeing its own memory.
   new FingerprintDataLoader(obfuscated_gaia_id, window_bounds, content_bounds,
                             screen_info, version, charset, accept_languages,
-                            install_time, app_locale, user_agent, timeout,
-                            callback);
+                            install_time, app_locale, timeout, callback);
 }
 
 }  // namespace internal
@@ -536,7 +531,6 @@
     const std::string& accept_languages,
     const base::Time& install_time,
     const std::string& app_locale,
-    const std::string& user_agent,
     const base::Callback<void(scoped_ptr<Fingerprint>)>& callback) {
   gfx::Rect content_bounds;
   web_contents.GetView()->GetContainerBounds(&content_bounds);
@@ -549,7 +543,7 @@
 
   internal::GetFingerprintInternal(
       obfuscated_gaia_id, window_bounds, content_bounds, screen_info, version,
-      charset, accept_languages, install_time, app_locale, user_agent,
+      charset, accept_languages, install_time, app_locale,
       base::TimeDelta::FromSeconds(kTimeoutSeconds), callback);
 }