Chromium Code Reviews| Index: device/geolocation/fake_location_provider.cc |
| diff --git a/device/geolocation/mock_location_provider.cc b/device/geolocation/fake_location_provider.cc |
| similarity index 64% |
| copy from device/geolocation/mock_location_provider.cc |
| copy to device/geolocation/fake_location_provider.cc |
| index 8190c5a2483530f7ba10bc79cdb679f60ee92d17..4787c29402b2861156c4e73ac06a975a5144c28c 100644 |
| --- a/device/geolocation/mock_location_provider.cc |
| +++ b/device/geolocation/fake_location_provider.cc |
| @@ -2,10 +2,10 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -// This file implements a mock location provider and the factory functions for |
| +// This file implements a fake location provider and the factory functions for |
| // various ways of creating it. |
| -#include "device/geolocation/mock_location_provider.h" |
| +#include "device/geolocation/fake_location_provider.h" |
| #include "base/bind.h" |
| #include "base/bind_helpers.h" |
| @@ -17,14 +17,14 @@ |
| namespace device { |
| -MockLocationProvider::MockLocationProvider() |
| +FakeLocationProvider::FakeLocationProvider() |
| : state_(STOPPED), |
| is_permission_granted_(false), |
| provider_task_runner_(base::ThreadTaskRunnerHandle::Get()) {} |
| -MockLocationProvider::~MockLocationProvider() {} |
| +FakeLocationProvider::~FakeLocationProvider() {} |
| -void MockLocationProvider::HandlePositionChanged(const Geoposition& position) { |
| +void FakeLocationProvider::HandlePositionChanged(const Geoposition& position) { |
| if (provider_task_runner_->BelongsToCurrentThread()) { |
| // The location arbitrator unit tests rely on this method running |
| // synchronously. |
| @@ -32,34 +32,34 @@ void MockLocationProvider::HandlePositionChanged(const Geoposition& position) { |
| NotifyCallback(position_); |
| } else { |
| provider_task_runner_->PostTask( |
| - FROM_HERE, base::Bind(&MockLocationProvider::HandlePositionChanged, |
| + FROM_HERE, base::Bind(&FakeLocationProvider::HandlePositionChanged, |
| base::Unretained(this), position)); |
| } |
| } |
| -bool MockLocationProvider::StartProvider(bool high_accuracy) { |
| +bool FakeLocationProvider::StartProvider(bool high_accuracy) { |
| state_ = high_accuracy ? HIGH_ACCURACY : LOW_ACCURACY; |
| return true; |
| } |
| -void MockLocationProvider::StopProvider() { |
| +void FakeLocationProvider::StopProvider() { |
| state_ = STOPPED; |
| } |
| -void MockLocationProvider::GetPosition(Geoposition* position) { |
| +void FakeLocationProvider::GetPosition(Geoposition* position) { |
| *position = position_; |
| } |
| -void MockLocationProvider::OnPermissionGranted() { |
| +void FakeLocationProvider::OnPermissionGranted() { |
| is_permission_granted_ = true; |
| } |
| -// Mock location provider that automatically calls back its client at most |
| +// Fake location provider that automatically calls back its client at most |
|
Kevin M
2016/08/15 20:35:40
Is this class used anywhere in Chromium?
CJ
2016/08/15 21:59:32
It is used in LocationArbitratorImplTest.
|
| // once, when StartProvider or OnPermissionGranted is called. Use |
| // |requires_permission_to_start| to select which event triggers the callback. |
| -class AutoMockLocationProvider : public MockLocationProvider { |
| +class AutoFakeLocationProvider : public FakeLocationProvider { |
| public: |
| - AutoMockLocationProvider(bool has_valid_location, |
| + AutoFakeLocationProvider(bool has_valid_location, |
| bool requires_permission_to_start) |
| : requires_permission_to_start_(requires_permission_to_start), |
| listeners_updated_(false) { |
| @@ -75,7 +75,7 @@ class AutoMockLocationProvider : public MockLocationProvider { |
| } |
| } |
| bool StartProvider(bool high_accuracy) override { |
| - MockLocationProvider::StartProvider(high_accuracy); |
| + FakeLocationProvider::StartProvider(high_accuracy); |
| if (!requires_permission_to_start_) { |
| UpdateListenersIfNeeded(); |
| } |
| @@ -83,7 +83,7 @@ class AutoMockLocationProvider : public MockLocationProvider { |
| } |
| void OnPermissionGranted() override { |
| - MockLocationProvider::OnPermissionGranted(); |
| + FakeLocationProvider::OnPermissionGranted(); |
| if (requires_permission_to_start_) { |
| UpdateListenersIfNeeded(); |
| } |
| @@ -93,7 +93,7 @@ class AutoMockLocationProvider : public MockLocationProvider { |
| if (!listeners_updated_) { |
| listeners_updated_ = true; |
| base::ThreadTaskRunnerHandle::Get()->PostTask( |
| - FROM_HERE, base::Bind(&MockLocationProvider::HandlePositionChanged, |
| + FROM_HERE, base::Bind(&FakeLocationProvider::HandlePositionChanged, |
| base::Unretained(this), position_)); |
| } |
| } |
| @@ -102,23 +102,23 @@ class AutoMockLocationProvider : public MockLocationProvider { |
| const bool requires_permission_to_start_; |
| bool listeners_updated_; |
| - DISALLOW_COPY_AND_ASSIGN(AutoMockLocationProvider); |
| + DISALLOW_COPY_AND_ASSIGN(AutoFakeLocationProvider); |
| }; |
| -LocationProvider* NewMockLocationProvider() { |
| - return new MockLocationProvider; |
| +LocationProvider* NewFakeLocationProvider() { |
|
Kevin M
2016/08/15 20:35:40
1. These helper methods are very unusual. Generall
CJ
2016/08/15 21:59:32
Done.
Kevin M
2016/08/17 00:55:02
They're still here... :)
CJ
2016/08/18 00:58:49
Still there? Are you saying you want the class Aut
|
| + return new FakeLocationProvider; |
| } |
| -LocationProvider* NewAutoSuccessMockLocationProvider() { |
| - return new AutoMockLocationProvider(true, false); |
| +LocationProvider* NewAutoSuccessFakeLocationProvider() { |
| + return new AutoFakeLocationProvider(true, false); |
| } |
| -LocationProvider* NewAutoFailMockLocationProvider() { |
| - return new AutoMockLocationProvider(false, false); |
| +LocationProvider* NewAutoFailFakeLocationProvider() { |
| + return new AutoFakeLocationProvider(false, false); |
| } |
| -LocationProvider* NewAutoSuccessMockNetworkLocationProvider() { |
| - return new AutoMockLocationProvider(true, true); |
| +LocationProvider* NewAutoSuccessFakeNetworkLocationProvider() { |
| + return new AutoFakeLocationProvider(true, true); |
| } |
| } // namespace device |