diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/browser/geolocation/win7_location_provider_unittest_win.cc | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/browser/geolocation/win7_location_provider_unittest_win.cc')
| -rw-r--r-- | chrome/browser/geolocation/win7_location_provider_unittest_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/geolocation/win7_location_provider_unittest_win.cc b/chrome/browser/geolocation/win7_location_provider_unittest_win.cc index 487f005..ababadd 100644 --- a/chrome/browser/geolocation/win7_location_provider_unittest_win.cc +++ b/chrome/browser/geolocation/win7_location_provider_unittest_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/browser_thread.h" +#include "base/message_loop.h" #include "chrome/browser/geolocation/win7_location_provider_win.h" #include "chrome/browser/geolocation/win7_location_api_win.h" #include "testing/gmock/include/gmock/gmock.h" @@ -49,10 +49,10 @@ class MockWin7LocationApi : public Win7LocationApi { } private: - MockWin7LocationApi() : Win7LocationApi(NULL, NULL, NULL) { + MockWin7LocationApi() : Win7LocationApi(NULL, NULL, NULL) { ON_CALL(*this, GetPosition(_)) .WillByDefault(Invoke(this, - &MockWin7LocationApi::GetPositionValid)); + &MockWin7LocationApi::GetPositionValid)); ON_CALL(*this, SetHighAccuracy(true)) .WillByDefault(Return(true)); ON_CALL(*this, SetHighAccuracy(false)) |