diff options
| author | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 09:30:43 +0000 |
|---|---|---|
| committer | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 09:30:43 +0000 |
| commit | 0aade93cab084f0f3a73240d32e931d4d7428e9f (patch) | |
| tree | 328fff78e0c07100603a2bb256b9fe8f7f7ff2f0 /chrome/browser/extensions | |
| parent | 29782346c1dea567ad0b161b2c4313945bc5b1f5 (diff) | |
| download | chromium_src-0aade93cab084f0f3a73240d32e931d4d7428e9f.zip chromium_src-0aade93cab084f0f3a73240d32e931d4d7428e9f.tar.gz chromium_src-0aade93cab084f0f3a73240d32e931d4d7428e9f.tar.bz2 | |
Revert 77714 - Make chrome://extension-icon resources available in incognito mode.
BUG=74905
TEST=ExtensionIconSourceTest
Review URL: http://codereview.chromium.org/6623057
TBR=jstritar@chromium.org
Review URL: http://codereview.chromium.org/6672024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77799 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/extension_icon_source_apitest.cc | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc index a7c2b70..ee2690c 100644 --- a/chrome/browser/extensions/extension_icon_source_apitest.cc +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc @@ -3,10 +3,7 @@ // found in the LICENSE file. #include "base/logging.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/tab_contents/tab_contents.h" @@ -44,37 +41,3 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) { &result)); EXPECT_EQ(result, "Not Loaded"); } - -IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) { - FilePath basedir = test_data_dir_.AppendASCII("icons"); - ASSERT_TRUE(LoadExtensionIncognito( - basedir.AppendASCII("extension_with_permission"))); - ASSERT_TRUE(LoadExtensionIncognito( - basedir.AppendASCII("extension_no_permission"))); - std::string result; - - // Test that the icons are loaded and that the chrome://extension-icon - // parameters work correctly. - ui_test_utils::OpenURLOffTheRecord( - browser()->profile(), - GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html")); - Browser* otr_browser = BrowserList::FindBrowserWithType( - browser()->profile()->GetOffTheRecordProfile(), Browser::TYPE_NORMAL, - false); - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - otr_browser->GetSelectedTabContents()->render_view_host(), L"", - L"window.domAutomationController.send(document.title)", - &result)); - EXPECT_EQ(result, "Loaded"); - - // Verify that the an extension can't load chrome://extension-icon icons - // without the management permission. - ui_test_utils::OpenURLOffTheRecord( - browser()->profile(), - GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html")); - ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - otr_browser->GetSelectedTabContents()->render_view_host(), L"", - L"window.domAutomationController.send(document.title)", - &result)); - EXPECT_EQ(result, "Not Loaded"); -} |