chrome/browser/extensions/api/networking_private/networking_private_apitest.cc - Issue 219523002: Move extension whitelist switch to //extensions

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

Issue 219523002: Move extension whitelist switch to //extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix cros Created 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/media_galleries_private/media_galleries_watch_apitest.cc ('k') | chrome/browser/extensions/api/tab_capture/tab_capture_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

index 92cfe2de04eb541a5a1c97dae0d7db32c02d55d1..45adfafe32ead07a6b01a6e2741ba12d4839c34f 100644

--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/extensions/extension_apitest.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/test/base/ui_test_utils.h"

+#include "extensions/common/switches.h"

#include "testing/gmock/include/gmock/gmock.h"

#if defined(OS_CHROMEOS)

@@ -117,8 +118,9 @@ class ExtensionNetworkingPrivateApiTest :

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

ExtensionApiTest::SetUpCommandLine(command_line);

// Whitelist the extension ID of the test extension.

- command_line->AppendSwitchASCII(::switches::kWhitelistedExtensionID,

- "epcifkihnkjgphfkloaaleeakhpmgdmn");

+ command_line->AppendSwitchASCII(

+ extensions::switches::kWhitelistedExtensionID,

+ "epcifkihnkjgphfkloaaleeakhpmgdmn");

// TODO(pneubeck): Remove the following hack, once the NetworkingPrivateAPI

// uses the ProfileHelper to obtain the userhash crbug/238623.

@@ -260,8 +262,9 @@ class ExtensionNetworkingPrivateApiTest :