Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Side by Side Diff: chrome/browser/geolocation/geolocation_provider_unittest.cc

Issue 6597044: Revert 76228 - Move core pieces of geolocation from chrome to content.This is... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/geolocation/geolocation_provider.h" 5 #include "chrome/browser/geolocation/geolocation_provider.h"
6 6
7 #include "base/singleton.h" 7 #include "base/singleton.h"
8 #include "chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h" 8 #include "chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h"
9 #include "chrome/browser/geolocation/fake_access_token_store.h" 9 #include "chrome/browser/geolocation/fake_access_token_store.h"
10 #include "chrome/browser/geolocation/location_arbitrator.h" 10 #include "chrome/browser/geolocation/location_arbitrator.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 provider_->RemoveObserver(&null_observer); 143 provider_->RemoveObserver(&null_observer);
144 message_loop_.Run(); 144 message_loop_.Run();
145 EXPECT_EQ(MockLocationProvider::instance_->state_, 145 EXPECT_EQ(MockLocationProvider::instance_->state_,
146 MockLocationProvider::STOPPED); 146 MockLocationProvider::STOPPED);
147 EXPECT_TRUE(provider_->IsRunning()); 147 EXPECT_TRUE(provider_->IsRunning());
148 148
149 GeolocationArbitrator::SetDependencyFactoryForTest(NULL); 149 GeolocationArbitrator::SetDependencyFactoryForTest(NULL);
150 } 150 }
151 151
152 } // namespace 152 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/geolocation/geolocation_provider.cc ('k') | chrome/browser/geolocation/geolocation_settings_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698