chrome/browser/extensions/plugin_apitest.cc - Issue 12298037: Revert 183123

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/extensions/plugin_apitest.cc

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 years, 10 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 | « chrome/browser/extensions/page_action_controller.cc ('k') | chrome/browser/extensions/script_badge_controller.cc » ('j') | no next file with comments »

OLD	NEW
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/prefs/pref_service.h"	5 #include "base/prefs/pref_service.h"

6 #include "chrome/browser/content_settings/host_content_settings_map.h"	6 #include "chrome/browser/content_settings/host_content_settings_map.h"

7 #include "chrome/browser/extensions/extension_browsertest.h"	7 #include "chrome/browser/extensions/extension_browsertest.h"

8 #include "chrome/browser/extensions/extension_service.h"	8 #include "chrome/browser/extensions/extension_service.h"

9 #include "chrome/browser/extensions/extension_system.h"	9 #include "chrome/browser/extensions/extension_system.h"

10 #include "chrome/browser/profiles/profile.h"

11 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

12 #include "chrome/browser/ui/browser_commands.h"	11 #include "chrome/browser/ui/browser_commands.h"

13 #include "chrome/browser/ui/tabs/tab_strip_model.h"	12 #include "chrome/browser/ui/tabs/tab_strip_model.h"

14 #include "chrome/common/extensions/extension.h"	13 #include "chrome/common/extensions/extension.h"

15 #include "chrome/common/pref_names.h"	14 #include "chrome/common/pref_names.h"

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

17 #include "content/public/browser/navigation_controller.h"	16 #include "content/public/browser/navigation_controller.h"

18 #include "content/public/browser/web_contents.h"	17 #include "content/public/browser/web_contents.h"

19 #include "content/public/test/browser_test_utils.h"	18 #include "content/public/test/browser_test_utils.h"

20 #include "net/base/net_util.h"	19 #include "net/base/net_util.h"

(...skipping 131 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 EXPECT_TRUE(result);	151 EXPECT_TRUE(result);

153 #endif	152 #endif

154	153

155 // Now load it through a file URL. The plugin should not load.	154 // Now load it through a file URL. The plugin should not load.

156 ui_test_utils::NavigateToURL(browser(),	155 ui_test_utils::NavigateToURL(browser(),

157 net::FilePathToFileURL(extension_dir.AppendASCII("test.html")));	156 net::FilePathToFileURL(extension_dir.AppendASCII("test.html")));

158 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(	157 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(

159 tab, "testPluginWorks()", &result));	158 tab, "testPluginWorks()", &result));

160 EXPECT_FALSE(result);	159 EXPECT_FALSE(result);

161 }	160 }

OLD	NEW