diff options
Diffstat (limited to 'chrome/browser')
8 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/geolocation/network_location_request.cc b/chrome/browser/geolocation/network_location_request.cc index 9aed423..a22a64c 100644 --- a/chrome/browser/geolocation/network_location_request.cc +++ b/chrome/browser/geolocation/network_location_request.cc @@ -152,7 +152,7 @@ bool FormRequestBody(const string16& host_name, base::JSONWriter::Write(&body_object, false, data); DLOG(INFO) << "NetworkLocationRequest::FormRequestBody(): Formed body " - << data << ".\n"; + << *data << ".\n"; return true; } diff --git a/chrome/browser/geolocation/wifi_data_provider_common.cc b/chrome/browser/geolocation/wifi_data_provider_common.cc index 0edb721..307325f 100644 --- a/chrome/browser/geolocation/wifi_data_provider_common.cc +++ b/chrome/browser/geolocation/wifi_data_provider_common.cc @@ -59,7 +59,7 @@ void WifiDataProviderCommon::Init() { } DCHECK(polling_policy_ == NULL); - polling_policy_.reset(NewPolicyPolicy()); + polling_policy_.reset(NewPollingPolicy()); DCHECK(polling_policy_ != NULL); // Perform first scan ASAP regardless of the polling policy. If this scan diff --git a/chrome/browser/geolocation/wifi_data_provider_common.h b/chrome/browser/geolocation/wifi_data_provider_common.h index 15ac8eb..086c149 100644 --- a/chrome/browser/geolocation/wifi_data_provider_common.h +++ b/chrome/browser/geolocation/wifi_data_provider_common.h @@ -86,7 +86,7 @@ class WifiDataProviderCommon virtual WlanApiInterface* NewWlanApi() = 0; // Returns ownership. Will be called from the worker thread. - virtual PollingPolicyInterface* NewPolicyPolicy() = 0; + virtual PollingPolicyInterface* NewPollingPolicy() = 0; private: // Thread implementation diff --git a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc index 6d3e4cb..655fac9 100644 --- a/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc +++ b/chrome/browser/geolocation/wifi_data_provider_common_unittest.cc @@ -56,7 +56,7 @@ class WifiDataProviderCommonWithMock : public WifiDataProviderCommon { CHECK(new_wlan_api_ != NULL); return new_wlan_api_.release(); } - virtual PollingPolicyInterface* NewPolicyPolicy() { + virtual PollingPolicyInterface* NewPollingPolicy() { return new GenericPollingPolicy<1, 2, 3>; } diff --git a/chrome/browser/geolocation/wifi_data_provider_mac.cc b/chrome/browser/geolocation/wifi_data_provider_mac.cc index bfe0a5c..df332e1 100644 --- a/chrome/browser/geolocation/wifi_data_provider_mac.cc +++ b/chrome/browser/geolocation/wifi_data_provider_mac.cc @@ -166,7 +166,7 @@ OsxWifiDataProvider::WlanApiInterface* OsxWifiDataProvider::NewWlanApi() { return wlan_api.release(); } -PollingPolicyInterface* OsxWifiDataProvider::NewPolicyPolicy() { +PollingPolicyInterface* OsxWifiDataProvider::NewPollingPolicy() { return new GenericPollingPolicy<kDefaultPollingInterval, kNoChangePollingInterval, kTwoNoChangePollingInterval>; diff --git a/chrome/browser/geolocation/wifi_data_provider_mac.h b/chrome/browser/geolocation/wifi_data_provider_mac.h index 3958502..a386c59 100644 --- a/chrome/browser/geolocation/wifi_data_provider_mac.h +++ b/chrome/browser/geolocation/wifi_data_provider_mac.h @@ -16,7 +16,7 @@ class OsxWifiDataProvider : public WifiDataProviderCommon { // WifiDataProviderCommon virtual WlanApiInterface* NewWlanApi(); - virtual PollingPolicyInterface* NewPolicyPolicy(); + virtual PollingPolicyInterface* NewPollingPolicy(); DISALLOW_COPY_AND_ASSIGN(OsxWifiDataProvider); }; diff --git a/chrome/browser/geolocation/wifi_data_provider_win.cc b/chrome/browser/geolocation/wifi_data_provider_win.cc index 971d678..d5f053e 100644 --- a/chrome/browser/geolocation/wifi_data_provider_win.cc +++ b/chrome/browser/geolocation/wifi_data_provider_win.cc @@ -175,7 +175,7 @@ WifiDataProviderCommon::WlanApiInterface* Win32WifiDataProvider::NewWlanApi() { return WindowsNdisApi::Create(); } -PollingPolicyInterface* Win32WifiDataProvider::NewPolicyPolicy() { +PollingPolicyInterface* Win32WifiDataProvider::NewPollingPolicy() { return new GenericPollingPolicy<kDefaultPollingInterval, kNoChangePollingInterval, kTwoNoChangePollingInterval>; diff --git a/chrome/browser/geolocation/wifi_data_provider_win.h b/chrome/browser/geolocation/wifi_data_provider_win.h index 3a1e727..d0aa0406 100644 --- a/chrome/browser/geolocation/wifi_data_provider_win.h +++ b/chrome/browser/geolocation/wifi_data_provider_win.h @@ -18,7 +18,7 @@ class Win32WifiDataProvider : public WifiDataProviderCommon { // WifiDataProviderCommon virtual WlanApiInterface* NewWlanApi(); - virtual PollingPolicyInterface* NewPolicyPolicy(); + virtual PollingPolicyInterface* NewPollingPolicy(); DISALLOW_COPY_AND_ASSIGN(Win32WifiDataProvider); }; |