Index: components/autofill/content/browser/risk/fingerprint.cc |
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc |
index 635224d13956c9d795d2a75ac74f99ff0aabf46c..7383b55f8fd5fcc38ff835aef62da8d533333235 100644 |
--- a/components/autofill/content/browser/risk/fingerprint.cc |
+++ b/components/autofill/content/browser/risk/fingerprint.cc |
@@ -68,20 +68,6 @@ std::string GetOperatingSystemVersion() { |
base::SysInfo::OperatingSystemVersion(); |
} |
-Fingerprint::MachineCharacteristics::BrowserFeature |
- DialogTypeToBrowserFeature(DialogType dialog_type) { |
- switch (dialog_type) { |
- case DIALOG_TYPE_AUTOCHECKOUT: |
- return Fingerprint::MachineCharacteristics::FEATURE_AUTOCHECKOUT; |
- |
- case DIALOG_TYPE_REQUEST_AUTOCOMPLETE: |
- return Fingerprint::MachineCharacteristics::FEATURE_REQUEST_AUTOCOMPLETE; |
- } |
- |
- NOTREACHED(); |
- return Fingerprint::MachineCharacteristics::FEATURE_UNKNOWN; |
-} |
- |
// Adds the list of |fonts| to the |machine|. |
void AddFontsToFingerprint(const base::ListValue& fonts, |
Fingerprint::MachineCharacteristics* machine) { |
@@ -201,7 +187,6 @@ class FingerprintDataLoader : public content::GpuDataManagerObserver { |
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); |
@@ -250,7 +235,6 @@ class FingerprintDataLoader : public content::GpuDataManagerObserver { |
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_; |
@@ -276,7 +260,6 @@ FingerprintDataLoader::FingerprintDataLoader( |
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()), |
@@ -289,7 +272,6 @@ FingerprintDataLoader::FingerprintDataLoader( |
charset_(charset), |
accept_languages_(accept_languages), |
install_time_(install_time), |
- dialog_type_(dialog_type), |
waiting_on_plugins_(true), |
callback_(callback) { |
DCHECK(!install_time_.is_null()); |
@@ -404,7 +386,8 @@ void FingerprintDataLoader::FillFingerprint() { |
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_)); |
+ machine->set_browser_feature( |
+ Fingerprint::MachineCharacteristics::FEATURE_REQUEST_AUTOCOMPLETE); |
AddFontsToFingerprint(*fonts_, machine); |
AddPluginsToFingerprint(plugins_, machine); |
AddAcceptLanguagesToFingerprint(accept_languages_, machine); |
@@ -463,14 +446,13 @@ void GetFingerprintInternal( |
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(obfuscated_gaia_id, window_bounds, content_bounds, |
screen_info, version, charset, accept_languages, |
- install_time, dialog_type, app_locale, callback); |
+ install_time, app_locale, callback); |
} |
} // namespace internal |
@@ -483,7 +465,6 @@ void GetFingerprint( |
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; |
@@ -497,8 +478,7 @@ void GetFingerprint( |
internal::GetFingerprintInternal( |
obfuscated_gaia_id, window_bounds, content_bounds, screen_info, version, |
- charset, accept_languages, install_time, dialog_type, app_locale, |
- callback); |
+ charset, accept_languages, install_time, app_locale, callback); |
} |
} // namespace risk |