chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc - Issue 9293010: Merge 119773 - Move click-to-play out of chrome://flags.

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/ui/content_settings/content_setting_bubble_model_unittest.cc

Issue 9293010: Merge 119773 - Move click-to-play out of chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src

Patch Set: '' Created 8 years, 11 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/resources/options/content_settings_exceptions_area.js ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

index 89450516b9f69390c33c5a3ba92b72f76ae497db..5fa44ed5a7dfbdb892b7ca09107f8aa7eb6d5812 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -107,7 +107,6 @@ TEST_F(ContentSettingBubbleModelTest, MultiplePlugins) {

CommandLine* cmd = CommandLine::ForCurrentProcess();

AutoReset<CommandLine> auto_reset(cmd, *cmd);

cmd->AppendSwitch(switches::kEnableResourceContentSettings);

- cmd->AppendSwitch(switches::kEnableClickToPlay);

HostContentSettingsMap* map = profile()->GetHostContentSettingsMap();

std::string fooPlugin = "foo";