Bring Geolocation to life!...

chrome/browser/geolocation/location_arbitrator_unittest.cc

 // Copyright (c) 2010 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 "chrome/browser/geolocation/location_arbitrator.h"
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/geolocation/fake_access_token_store.h"
 #include "chrome/browser/geolocation/location_provider.h"
 #include "chrome/common/geoposition.h"
@@ skipping 24 matching lines @@
   ASSERT_TRUE(position->IsInitialized());
   ASSERT_TRUE(position->IsValidFix());
 }
 
 }  // namespace
 
 class GeolocationLocationArbitratorTest : public testing::Test {
  protected:
   virtual void SetUp() {
     access_token_store_ = new FakeAccessTokenStore;
-    arbitrator_.reset(GeolocationArbitrator::Create(access_token_store_.get(),
-                                                    NULL));
-    arbitrator_->SetUseMockProvider(true);
+    GeolocationArbitrator::SetUseMockProvider(true);
+    arbitrator_ = GeolocationArbitrator::Create(access_token_store_.get(),
+                                                NULL);
   }
 
   virtual void TearDown() {
   }
 
   scoped_refptr<FakeAccessTokenStore> access_token_store_;
-  scoped_ptr<GeolocationArbitrator> arbitrator_;
+  scoped_refptr<GeolocationArbitrator> arbitrator_;
 };
 
 TEST_F(GeolocationLocationArbitratorTest, CreateDestroy) {
   EXPECT_TRUE(access_token_store_);
   EXPECT_TRUE(arbitrator_ != NULL);
-  arbitrator_.reset();
+  arbitrator_ = NULL;
   SUCCEED();
 }
 
 TEST_F(GeolocationLocationArbitratorTest, NormalUsage) {
   ASSERT_TRUE(access_token_store_);
   ASSERT_TRUE(arbitrator_ != NULL);
 
   EXPECT_TRUE(access_token_store_->access_token_set_.empty());
   EXPECT_FALSE(access_token_store_->request_);
   MockLocationObserver observer;
@@ skipping 75 matching lines @@
   EXPECT_TRUE(observer1.last_position_.IsValidFix());
 
   MockLocationObserver observer2;
   EXPECT_FALSE(observer2.last_position_.IsValidFix());
   arbitrator_->AddObserver(&observer2, GeolocationArbitrator::UpdateOptions());
   EXPECT_TRUE(observer2.last_position_.IsValidFix());
 
   EXPECT_TRUE(arbitrator_->RemoveObserver(&observer1));
   EXPECT_TRUE(arbitrator_->RemoveObserver(&observer2));
 }