chrome/browser/extensions/api/cast_streaming/cast_streaming_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/cast_streaming/cast_streaming_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/cast_channel/cast_channel_apitest.cc ('k') | chrome/browser/extensions/api/cast_streaming/performance_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc

diff --git a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc

index ea2a5b4fdb6361bb4797f25401a41c455c060f0a..60aba358c0632d8b02db874b7c516de6d06598cc 100644

--- a/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc

+++ b/chrome/browser/extensions/api/cast_streaming/cast_streaming_apitest.cc

@@ -14,6 +14,7 @@

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

#include "chrome/common/chrome_switches.h"

#include "content/public/common/content_switches.h"

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

#include "media/base/bind_to_current_loop.h"

#include "media/base/video_frame.h"

#include "media/cast/cast_config.h"

@@ -34,8 +35,9 @@ class CastStreamingApiTest : public ExtensionApiTest {

public:

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

ExtensionApiTest::SetUpCommandLine(command_line);

- command_line->AppendSwitchASCII(switches::kWhitelistedExtensionID,

- "ddchlicdkolnonkihahngkmmmjnjlkkf");

+ command_line->AppendSwitchASCII(

+ extensions::switches::kWhitelistedExtensionID,

+ "ddchlicdkolnonkihahngkmmmjnjlkkf");

}

};

@@ -267,7 +269,7 @@ class CastStreamingApiTestWithPixelOutput : public CastStreamingApiTest {

}

virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {

- command_line->AppendSwitchASCII(switches::kWindowSize, "128,128");

+ command_line->AppendSwitchASCII(::switches::kWindowSize, "128,128");

CastStreamingApiTest::SetUpCommandLine(command_line);

}

};