| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
| 7 #include "chrome/browser/content_settings/host_content_settings_map.h" | |
| 8 #include "chrome/browser/extensions/extension_browsertest.h" | 7 #include "chrome/browser/extensions/extension_browsertest.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 9 #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/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/test/base/test_switches.h" | 14 #include "chrome/test/base/test_switches.h" |
| 16 #include "chrome/test/base/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 17 #include "content/public/browser/navigation_controller.h" | 17 #include "content/public/browser/navigation_controller.h" |
| 18 #include "content/public/browser/plugin_service.h" | 18 #include "content/public/browser/plugin_service.h" |
| 19 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
| 20 #include "content/public/test/browser_test_utils.h" | 20 #include "content/public/test/browser_test_utils.h" |
| 21 #include "extensions/browser/extension_system.h" | 21 #include "extensions/browser/extension_system.h" |
| 22 #include "extensions/common/extension.h" | 22 #include "extensions/common/extension.h" |
| 23 #include "net/base/filename_util.h" | 23 #include "net/base/filename_util.h" |
| 24 | 24 |
| 25 using content::NavigationController; | 25 using content::NavigationController; |
| 26 using content::WebContents; | 26 using content::WebContents; |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 EXPECT_TRUE(result); | 180 EXPECT_TRUE(result); |
| 181 #endif | 181 #endif |
| 182 | 182 |
| 183 // Now load it through a file URL. The plugin should not load. | 183 // Now load it through a file URL. The plugin should not load. |
| 184 ui_test_utils::NavigateToURL(browser(), | 184 ui_test_utils::NavigateToURL(browser(), |
| 185 net::FilePathToFileURL(extension_dir.AppendASCII("test.html"))); | 185 net::FilePathToFileURL(extension_dir.AppendASCII("test.html"))); |
| 186 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( | 186 ASSERT_TRUE(content::ExecuteScriptAndExtractBool( |
| 187 tab, "testPluginWorks()", &result)); | 187 tab, "testPluginWorks()", &result)); |
| 188 EXPECT_FALSE(result); | 188 EXPECT_FALSE(result); |
| 189 } | 189 } |
| OLD | NEW |