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

Side by Side Diff: content/browser/geolocation/location_arbitrator_impl_unittest.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "content/browser/geolocation/fake_access_token_store.h" 7 #include "content/browser/geolocation/fake_access_token_store.h"
8 #include "content/browser/geolocation/location_arbitrator_impl.h" 8 #include "content/browser/geolocation/location_arbitrator_impl.h"
9 #include "content/browser/geolocation/mock_location_provider.h" 9 #include "content/browser/geolocation/mock_location_provider.h"
10 #include "content/public/common/geoposition.h" 10 #include "content/public/common/geoposition.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 } 78 }
79 79
80 virtual AccessTokenStore* NewAccessTokenStore() OVERRIDE { 80 virtual AccessTokenStore* NewAccessTokenStore() OVERRIDE {
81 return access_token_store_.get(); 81 return access_token_store_.get();
82 } 82 }
83 83
84 virtual LocationProvider* NewNetworkLocationProvider( 84 virtual LocationProvider* NewNetworkLocationProvider(
85 AccessTokenStore* access_token_store, 85 AccessTokenStore* access_token_store,
86 net::URLRequestContextGetter* context, 86 net::URLRequestContextGetter* context,
87 const GURL& url, 87 const GURL& url,
88 const string16& access_token) OVERRIDE { 88 const base::string16& access_token) OVERRIDE {
89 return new MockLocationProvider(&cell_); 89 return new MockLocationProvider(&cell_);
90 } 90 }
91 91
92 virtual LocationProvider* NewSystemLocationProvider() OVERRIDE { 92 virtual LocationProvider* NewSystemLocationProvider() OVERRIDE {
93 return new MockLocationProvider(&gps_); 93 return new MockLocationProvider(&gps_);
94 } 94 }
95 95
96 // Two location providers, with nice short names to make the tests more 96 // Two location providers, with nice short names to make the tests more
97 // readable. Note |gps_| will only be set when there is a high accuracy 97 // readable. Note |gps_| will only be set when there is a high accuracy
98 // observer registered (and |cell_| when there's at least one observer of any 98 // observer registered (and |cell_| when there's at least one observer of any
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 321
322 // Update with a less accurate position to verify 240956. 322 // Update with a less accurate position to verify 240956.
323 SetPositionFix(cell(), 3, 139, 150); 323 SetPositionFix(cell(), 3, 139, 150);
324 CheckLastPositionInfo(3, 139, 150); 324 CheckLastPositionInfo(3, 139, 150);
325 325
326 // No delete required for fakeMockProvider. It points to fakeProvider. 326 // No delete required for fakeMockProvider. It points to fakeProvider.
327 delete fakeProvider; 327 delete fakeProvider;
328 } 328 }
329 329
330 } // namespace content 330 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/geolocation/location_arbitrator_impl.cc ('k') | content/browser/geolocation/network_location_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698