Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

components/autofill/browser/risk/fingerprint.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 "components/autofill/browser/risk/fingerprint.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/cpu.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "base/sys_info.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "components/autofill/browser/risk/proto/fingerprint.pb.h"
-#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/font_list_async.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/gpu_info.h"
@@ skipping 154 matching lines @@
   FingerprintDataLoader(
       int64 gaia_id,
       const gfx::Rect& window_bounds,
       const gfx::Rect& content_bounds,
       const WebScreenInfo& screen_info,
       const std::string& version,
       const std::string& charset,
       const std::string& accept_languages,
       const base::Time& install_time,
       DialogType dialog_type,
+      const std::string& app_locale,
       const base::Callback<void(scoped_ptr<Fingerprint>)>& callback);
 
  private:
   virtual ~FingerprintDataLoader();
 
   // content::GpuDataManagerObserver:
   virtual void OnGpuInfoUpdate() OVERRIDE;
 
   // Callbacks for asynchronously loaded data.
   void OnGotFonts(scoped_ptr<base::ListValue> fonts);
@@ skipping 18 matching lines @@
   const std::string charset_;
   const std::string accept_languages_;
   const base::Time install_time_;
   DialogType dialog_type_;
 
   // Data that will be loaded asynchronously.
   scoped_ptr<base::ListValue> fonts_;
   std::vector<webkit::WebPluginInfo> plugins_;
   bool has_loaded_plugins_;
 
+  // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(FingerprintDataLoader);
 };
 
 FingerprintDataLoader::FingerprintDataLoader(
     int64 gaia_id,
     const gfx::Rect& window_bounds,
     const gfx::Rect& content_bounds,
     const WebScreenInfo& screen_info,
     const std::string& version,
     const std::string& charset,
     const std::string& accept_languages,
     const base::Time& install_time,
     DialogType dialog_type,
+    const std::string& app_locale,
     const base::Callback<void(scoped_ptr<Fingerprint>)>& callback)
     : gpu_data_manager_(content::GpuDataManager::GetInstance()),
       gaia_id_(gaia_id),
       window_bounds_(window_bounds),
       content_bounds_(content_bounds),
       screen_info_(screen_info),
       version_(version),
       charset_(charset),
       accept_languages_(accept_languages),
       install_time_(install_time),
@@ skipping 55 matching lines @@
 void FingerprintDataLoader::FillFingerprint() {
   scoped_ptr<Fingerprint> fingerprint(new Fingerprint);
   Fingerprint_MachineCharacteristics* machine =
       fingerprint->mutable_machine_characteristics();
 
   machine->set_operating_system_build(GetOperatingSystemVersion());
   // We use the delta between the install time and the Unix epoch, in hours.
   machine->set_browser_install_time_hours(
       (install_time_ - base::Time::UnixEpoch()).InHours());
   machine->set_utc_offset_ms(GetTimezoneOffset().InMilliseconds());
-  machine->set_browser_language(
-      content::GetContentClient()->browser()->GetApplicationLocale());
+  machine->set_browser_language(app_locale_);
   machine->set_charset(charset_);
-  machine->set_user_agent(content::GetContentClient()->GetUserAgent());
+  machine->set_user_agent(content::GetUserAgent(GURL()));
   machine->set_ram(base::SysInfo::AmountOfPhysicalMemory());
   machine->set_browser_build(version_);
   machine->set_browser_feature(DialogTypeToBrowserFeature(dialog_type_));
   AddFontsToFingerprint(*fonts_, machine);
   AddPluginsToFingerprint(plugins_, machine);
   AddAcceptLanguagesToFingerprint(accept_languages_, machine);
   AddScreenInfoToFingerprint(screen_info_, machine);
   AddCpuInfoToFingerprint(machine);
   AddGpuInfoToFingerprint(machine);
 
@@ skipping 29 matching lines @@
 
 void GetFingerprint(
     int64 gaia_id,
     const gfx::Rect& window_bounds,
     const content::WebContents& web_contents,
     const std::string& version,
     const std::string& charset,
     const std::string& accept_languages,
     const base::Time& install_time,
     DialogType dialog_type,
+    const std::string& app_locale,
     const base::Callback<void(scoped_ptr<Fingerprint>)>& callback) {
   gfx::Rect content_bounds;
   web_contents.GetView()->GetContainerBounds(&content_bounds);
 
   WebKit::WebScreenInfo screen_info;
   content::RenderWidgetHostView* host_view =
       web_contents.GetRenderWidgetHostView();
   if (host_view)
     host_view->GetRenderWidgetHost()->GetWebScreenInfo(&screen_info);
 
   internal::GetFingerprintInternal(
       gaia_id, window_bounds, content_bounds, screen_info, version, charset,
-      accept_languages, install_time, dialog_type, callback);
+      accept_languages, install_time, dialog_type, app_locale, callback);
 }
 
 namespace internal {
 
 void GetFingerprintInternal(
     int64 gaia_id,
     const gfx::Rect& window_bounds,
     const gfx::Rect& content_bounds,
     const WebKit::WebScreenInfo& screen_info,
     const std::string& version,
     const std::string& charset,
     const std::string& accept_languages,
     const base::Time& install_time,
     DialogType dialog_type,
+    const std::string& app_locale,
     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(gaia_id, window_bounds, content_bounds, screen_info,
                             version, charset, accept_languages, install_time,
-                            dialog_type, callback);
+                            dialog_type, app_locale, callback);
 }
 
 }  // namespace internal
 
 }  // namespace risk
 }  // namespace autofill