Gets rid of the LocationArbitrator interface, in preference for LocationProvider.

device/geolocation/geolocation_provider_impl_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/geolocation/geolocation_provider_impl.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "device/geolocation/access_token_store.h"
 #include "device/geolocation/mock_location_arbitrator.h"

[Kevin M, 2016/08/10 23:16:19]

Does this build? MockLocationArbitrator subclasses LocationArbitrator, which has
been removed?

This include should probably be removed.

[CJ, 2016/08/11 22:16:53]

Done.

 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::MakeMatcher;
 using testing::Matcher;
 using testing::MatcherInterface;
 using testing::MatchResultListener;
 
 namespace device {

[Kevin M, 2016/08/10 23:16:19]

Use an anonymous namespace under device?

[CJ, 2016/08/11 22:16:53]

Done.

 
 class LocationProviderForTestArbitrator : public GeolocationProviderImpl {
  public:
   LocationProviderForTestArbitrator() : mock_arbitrator_(NULL) {}
   ~LocationProviderForTestArbitrator() override {}
 
   // Only valid for use on the geolocation thread.
   MockLocationArbitrator* mock_arbitrator() const { return mock_arbitrator_; }
 
  protected:
   // GeolocationProviderImpl implementation:
-  std::unique_ptr<LocationArbitrator> CreateArbitrator() override;
+  std::unique_ptr<LocationProvider> CreateArbitrator() override;
 
  private:
   // An alias to the arbitrator stored in the super class, where it is owned.
   MockLocationArbitrator* mock_arbitrator_;
 };
 
-std::unique_ptr<LocationArbitrator>
+std::unique_ptr<LocationProvider>
 LocationProviderForTestArbitrator::CreateArbitrator() {
   DCHECK(mock_arbitrator_ == NULL);
   mock_arbitrator_ = new MockLocationArbitrator;
   return base::WrapUnique(mock_arbitrator_);
 }
 
 class GeolocationObserver {
  public:
   virtual ~GeolocationObserver() {}
   virtual void OnLocationUpdate(const Geoposition& position) = 0;
@@ skipping 183 matching lines @@
       base::Bind(&MockGeolocationObserver::OnLocationUpdate,
                  base::Unretained(&mock_observer));
   std::unique_ptr<GeolocationProvider::Subscription> subscription =
       provider()->AddLocationUpdateCallback(callback, false);
   subscription.reset();
   // Wait for the providers to be stopped now that all clients are gone.
   EXPECT_FALSE(ProvidersStarted());
 }
 
 }  // namespace device