Dispatch geolocation IPCs on the UI thread. Aside from simplifying the code to avoid a lot of threa…

content/browser/geolocation/geolocation_provider_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
@@ skipping 96 matching lines @@
 };
 
 Matcher<const Geoposition&> GeopositionEq(const Geoposition& expected) {
   return MakeMatcher(new GeopositionEqMatcher(expected));
 }
 
 class GeolocationProviderTest : public testing::Test {
  protected:
   GeolocationProviderTest()
       : message_loop_(),
-        io_thread_(BrowserThread::IO, &message_loop_),
+        ui_thread_(BrowserThread::UI, &message_loop_),
         provider_(new LocationProviderForTestArbitrator) {
   }
 
   virtual ~GeolocationProviderTest() {}
 
   LocationProviderForTestArbitrator* provider() { return provider_.get(); }
 
   // Called on test thread.
   bool ProvidersStarted();
   void SendMockLocation(const Geoposition& position);
 
  private:
   // Called on provider thread.
   void GetProvidersStarted(bool* started);
 
   base::MessageLoop message_loop_;
-  TestBrowserThread io_thread_;
+  TestBrowserThread ui_thread_;
   scoped_ptr<LocationProviderForTestArbitrator> provider_;
 };
 
 
 bool GeolocationProviderTest::ProvidersStarted() {
   DCHECK(provider_->IsRunning());
   DCHECK(base::MessageLoop::current() == &message_loop_);
   bool started;
   provider_->message_loop_proxy()->PostTaskAndReply(
       FROM_HERE,
@@ skipping 15 matching lines @@
   DCHECK(base::MessageLoop::current() == &message_loop_);
   provider_->message_loop()
       ->PostTask(FROM_HERE,
                  base::Bind(&GeolocationProviderImpl::OnLocationUpdate,
                             base::Unretained(provider_.get()),
                             position));
 }
 
 // Regression test for http://crbug.com/59377
 TEST_F(GeolocationProviderTest, OnPermissionGrantedWithoutObservers) {
-  EXPECT_FALSE(provider()->LocationServicesOptedIn());
+  EXPECT_FALSE(provider()->user_did_opt_into_location_services_for_testing());
   provider()->UserDidOptIntoLocationServices();
-  EXPECT_TRUE(provider()->LocationServicesOptedIn());
+  EXPECT_TRUE(provider()->user_did_opt_into_location_services_for_testing());
+}
+
+void DummyFunction(const Geoposition& position) {
 }
 
 TEST_F(GeolocationProviderTest, StartStop) {
   EXPECT_FALSE(provider()->IsRunning());
-  GeolocationProviderImpl::LocationUpdateCallback null_callback;
-  provider()->AddLocationUpdateCallback(null_callback, false);
+  GeolocationProviderImpl::LocationUpdateCallback callback =
+      base::Bind(&DummyFunction);
+  scoped_ptr<content::GeolocationProvider::Subscription> subscription =
+      provider()->AddLocationUpdateCallback(callback, false);
   EXPECT_TRUE(provider()->IsRunning());
   EXPECT_TRUE(ProvidersStarted());
 
-  provider()->RemoveLocationUpdateCallback(null_callback);
+  subscription.reset();
+
   EXPECT_FALSE(ProvidersStarted());
   EXPECT_TRUE(provider()->IsRunning());
 }
 
 TEST_F(GeolocationProviderTest, StalePositionNotSent) {
   Geoposition first_position;
   first_position.latitude = 12;
   first_position.longitude = 34;
   first_position.accuracy = 56;
   first_position.timestamp = base::Time::Now();
 
   AsyncMockGeolocationObserver first_observer;
   GeolocationProviderImpl::LocationUpdateCallback first_callback = base::Bind(
       &MockGeolocationObserver::OnLocationUpdate,
       base::Unretained(&first_observer));
   EXPECT_CALL(first_observer, OnLocationUpdate(GeopositionEq(first_position)));
-  provider()->AddLocationUpdateCallback(first_callback, false);
+  scoped_ptr<content::GeolocationProvider::Subscription> subscription =
+      provider()->AddLocationUpdateCallback(first_callback, false);
   SendMockLocation(first_position);
   base::MessageLoop::current()->Run();
 
-  provider()->RemoveLocationUpdateCallback(first_callback);
+  subscription.reset();
 
   Geoposition second_position;
   second_position.latitude = 13;
   second_position.longitude = 34;
   second_position.accuracy = 56;
   second_position.timestamp = base::Time::Now();
 
   AsyncMockGeolocationObserver second_observer;
 
   // After adding a second observer, check that no unexpected position update
   // is sent.
   EXPECT_CALL(second_observer, OnLocationUpdate(testing::_)).Times(0);
   GeolocationProviderImpl::LocationUpdateCallback second_callback = base::Bind(
       &MockGeolocationObserver::OnLocationUpdate,
       base::Unretained(&second_observer));
-  provider()->AddLocationUpdateCallback(second_callback, false);
+  scoped_ptr<content::GeolocationProvider::Subscription> subscription2 =
+      provider()->AddLocationUpdateCallback(second_callback, false);
   base::MessageLoop::current()->RunUntilIdle();
 
   // The second observer should receive the new position now.
   EXPECT_CALL(second_observer,
               OnLocationUpdate(GeopositionEq(second_position)));
   SendMockLocation(second_position);
   base::MessageLoop::current()->Run();
 
-  provider()->RemoveLocationUpdateCallback(second_callback);
+  subscription2.reset();
   EXPECT_FALSE(ProvidersStarted());
 }
 
 TEST_F(GeolocationProviderTest, OverrideLocationForTesting) {
   Geoposition position;
   position.error_code = Geoposition::ERROR_CODE_POSITION_UNAVAILABLE;
   provider()->OverrideLocationForTesting(position);
   // Adding an observer when the location is overridden should synchronously
   // update the observer with our overridden position.
   MockGeolocationObserver mock_observer;
   EXPECT_CALL(mock_observer, OnLocationUpdate(GeopositionEq(position)));
   GeolocationProviderImpl::LocationUpdateCallback callback = base::Bind(
       &MockGeolocationObserver::OnLocationUpdate,
       base::Unretained(&mock_observer));
-  provider()->AddLocationUpdateCallback(callback, false);
-  provider()->RemoveLocationUpdateCallback(callback);
+  scoped_ptr<content::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 content