Adds GeolocationFeature for Blimp Geolocation project.

device/geolocation/location_arbitrator_impl_unittest.cc

Index: device/geolocation/location_arbitrator_impl_unittest.cc
diff --git a/device/geolocation/location_arbitrator_impl_unittest.cc b/device/geolocation/location_arbitrator_impl_unittest.cc
index 9e01f1181f12e7bb403cedafd81b928b49bc6539..e77f82154121b29134d41a37e0c18655236a194d 100644
--- a/device/geolocation/location_arbitrator_impl_unittest.cc
+++ b/device/geolocation/location_arbitrator_impl_unittest.cc
@@ -5,13 +5,14 @@
 #include "device/geolocation/location_arbitrator_impl.h"
 
 #include <memory>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "device/geolocation/fake_access_token_store.h"
+#include "device/geolocation/fake_location_provider.h"
 #include "device/geolocation/geolocation_delegate.h"
 #include "device/geolocation/geoposition.h"
-#include "device/geolocation/mock_location_provider.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -46,7 +47,7 @@ void AdvanceTimeNow(const base::TimeDelta& delta) {
   g_fake_time_now_secs += delta.InSecondsF();
 }
 
-void SetPositionFix(MockLocationProvider* provider,
+void SetPositionFix(FakeLocationProvider* provider,
                     double latitude,
                     double longitude,
                     double accuracy) {
@@ -60,7 +61,7 @@ void SetPositionFix(MockLocationProvider* provider,
   provider->HandlePositionChanged(position);
 }
 
-void SetReferencePosition(MockLocationProvider* provider) {
+void SetReferencePosition(FakeLocationProvider* provider) {

[Kevin M, 2016/08/15 20:35:40]

Cleanup todo:

Populate a Geoposition in the class from kConstants and then just copy that with
"=" versus using a helper function.

[CJ, 2016/08/15 21:59:32]

Acknowledged.

   SetPositionFix(provider, 51.0, -0.1, 400);
 }
 
@@ -75,17 +76,17 @@ class FakeGeolocationDelegate : public GeolocationDelegate {
 
   std::unique_ptr<LocationProvider> OverrideSystemLocationProvider() override {
     DCHECK(!mock_location_provider_);
-    mock_location_provider_ = new MockLocationProvider;
+    mock_location_provider_ = new FakeLocationProvider;
     return base::WrapUnique(mock_location_provider_);
   }
 
-  MockLocationProvider* mock_location_provider() const {
+  FakeLocationProvider* mock_location_provider() const {
     return mock_location_provider_;
   }
 
  private:
   bool use_network_ = true;
-  MockLocationProvider* mock_location_provider_ = nullptr;
+  FakeLocationProvider* mock_location_provider_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(FakeGeolocationDelegate);
 };
@@ -114,12 +115,12 @@ class TestingLocationArbitrator : public LocationArbitratorImpl {
       const scoped_refptr<net::URLRequestContextGetter>& context,
       const GURL& url,
       const base::string16& access_token) override {
-    cell_ = new MockLocationProvider;
+    cell_ = new FakeLocationProvider;
     return base::WrapUnique(cell_);
   }
 
   std::unique_ptr<LocationProvider> NewSystemLocationProvider() override {
-    gps_ = new MockLocationProvider;
+    gps_ = new FakeLocationProvider;
     return base::WrapUnique(gps_);
   }
 
@@ -129,8 +130,8 @@ class TestingLocationArbitrator : public LocationArbitratorImpl {
   // type).
   // TODO(mvanouwerkerk): rename |cell_| to |network_location_provider_| and
   // |gps_| to |gps_location_provider_|
-  MockLocationProvider* cell_;
-  MockLocationProvider* gps_;
+  FakeLocationProvider* cell_;
+  FakeLocationProvider* gps_;
   const scoped_refptr<AccessTokenStore> access_token_store_;
 };
 
@@ -172,9 +173,9 @@ class GeolocationLocationArbitratorTest : public testing::Test {
         LocationArbitratorImpl::kFixStaleTimeoutMilliseconds + 1);
   }
 
-  MockLocationProvider* cell() { return arbitrator_->cell_; }
+  FakeLocationProvider* cell() { return arbitrator_->cell_; }
 
-  MockLocationProvider* gps() { return arbitrator_->gps_; }
+  FakeLocationProvider* gps() { return arbitrator_->gps_; }
 
   const scoped_refptr<FakeAccessTokenStore> access_token_store_;
   const std::unique_ptr<MockLocationObserver> observer_;
@@ -216,8 +217,8 @@ TEST_F(GeolocationLocationArbitratorTest, NormalUsage) {
   access_token_store_->NotifyDelegateTokensLoaded();
   ASSERT_TRUE(cell());
   EXPECT_TRUE(gps());
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY, cell()->state_);
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY, gps()->state_);
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY, cell()->state_);
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY, gps()->state_);
   EXPECT_FALSE(observer_->last_position_.Validate());
   EXPECT_EQ(Geoposition::ERROR_CODE_NONE, observer_->last_position_.error_code);
 
@@ -250,7 +251,7 @@ TEST_F(GeolocationLocationArbitratorTest, CustomSystemProviderOnly) {
   ASSERT_FALSE(cell());
   EXPECT_FALSE(gps());
   ASSERT_TRUE(fake_delegate->mock_location_provider());
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY,
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY,
             fake_delegate->mock_location_provider()->state_);
   EXPECT_FALSE(observer_->last_position_.Validate());
   EXPECT_EQ(Geoposition::ERROR_CODE_NONE, observer_->last_position_.error_code);
@@ -290,9 +291,9 @@ TEST_F(GeolocationLocationArbitratorTest,
   ASSERT_TRUE(cell());
   EXPECT_FALSE(gps());
   ASSERT_TRUE(fake_delegate->mock_location_provider());
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY,
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY,
             fake_delegate->mock_location_provider()->state_);
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY, cell()->state_);
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY, cell()->state_);
   EXPECT_FALSE(observer_->last_position_.Validate());
   EXPECT_EQ(Geoposition::ERROR_CODE_NONE, observer_->last_position_.error_code);
 
@@ -316,14 +317,14 @@ TEST_F(GeolocationLocationArbitratorTest, SetObserverOptions) {
   access_token_store_->NotifyDelegateTokensLoaded();
   ASSERT_TRUE(cell());
   ASSERT_TRUE(gps());
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY, cell()->state_);
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY, gps()->state_);
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY, cell()->state_);
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY, gps()->state_);
   SetReferencePosition(cell());
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY, cell()->state_);
-  EXPECT_EQ(MockLocationProvider::LOW_ACCURACY, gps()->state_);
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY, cell()->state_);
+  EXPECT_EQ(FakeLocationProvider::LOW_ACCURACY, gps()->state_);
   arbitrator_->StartProviders(true);
-  EXPECT_EQ(MockLocationProvider::HIGH_ACCURACY, cell()->state_);
-  EXPECT_EQ(MockLocationProvider::HIGH_ACCURACY, gps()->state_);
+  EXPECT_EQ(FakeLocationProvider::HIGH_ACCURACY, cell()->state_);
+  EXPECT_EQ(FakeLocationProvider::HIGH_ACCURACY, gps()->state_);
 }
 
 TEST_F(GeolocationLocationArbitratorTest, Arbitration) {
@@ -419,8 +420,8 @@ TEST_F(GeolocationLocationArbitratorTest, TwoOneShotsIsNewPositionBetter) {
 
   // To test 240956, perform a throwaway alloc.
   // This convinces the allocator to put the providers in a new memory location.
-  std::unique_ptr<MockLocationProvider> dummy_provider(
-      new MockLocationProvider);
+  std::unique_ptr<FakeLocationProvider> dummy_provider(
+      new FakeLocationProvider);
 
   arbitrator_->StartProviders(false);
   access_token_store_->NotifyDelegateTokensLoaded();