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

Side by Side Diff: chrome/browser/extensions/extension_geolocation_apitest.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
« no previous file with comments | « no previous file | chrome/browser/geolocation/access_token_store.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "content/browser/geolocation/location_arbitrator.h" 6 #include "chrome/browser/geolocation/location_arbitrator.h"
7 #include "content/browser/geolocation/mock_location_provider.h" 7 #include "chrome/browser/geolocation/mock_location_provider.h"
8 #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h " 8 #include "chrome/browser/geolocation/arbitrator_dependency_factories_for_test.h"
9 9
10 class GeolocationApiTest : public ExtensionApiTest { 10 class GeolocationApiTest : public ExtensionApiTest {
11 public: 11 public:
12 GeolocationApiTest() 12 GeolocationApiTest()
13 : dependency_factory_( 13 : dependency_factory_(
14 new GeolocationArbitratorDependencyFactoryWithLocationProvider( 14 new GeolocationArbitratorDependencyFactoryWithLocationProvider(
15 &NewAutoSuccessMockLocationProvider)) { 15 &NewAutoSuccessMockLocationProvider)) {
16 } 16 }
17 17
18 // InProcessBrowserTest 18 // InProcessBrowserTest
(...skipping 15 matching lines...) Expand all
34 IN_PROC_BROWSER_TEST_F(GeolocationApiTest, 34 IN_PROC_BROWSER_TEST_F(GeolocationApiTest,
35 FLAKY_ExtensionGeolocationAccessFail) { 35 FLAKY_ExtensionGeolocationAccessFail) {
36 // Test that geolocation cannot be accessed from extension without permission. 36 // Test that geolocation cannot be accessed from extension without permission.
37 ASSERT_TRUE(RunExtensionTest("geolocation/no_permission")) << message_; 37 ASSERT_TRUE(RunExtensionTest("geolocation/no_permission")) << message_;
38 } 38 }
39 39
40 IN_PROC_BROWSER_TEST_F(GeolocationApiTest, ExtensionGeolocationAccessPass) { 40 IN_PROC_BROWSER_TEST_F(GeolocationApiTest, ExtensionGeolocationAccessPass) {
41 // Test that geolocation can be accessed from extension with permission. 41 // Test that geolocation can be accessed from extension with permission.
42 ASSERT_TRUE(RunExtensionTest("geolocation/has_permission")) << message_; 42 ASSERT_TRUE(RunExtensionTest("geolocation/has_permission")) << message_;
43 } 43 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/geolocation/access_token_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698