Revert 78554 - Make chrome://extension-icon resources available in incognito mode.

(Will revert, trying to determine what is causing the test flake.)

BUG=74905, 75748
TEST=ExtensionIconSourceTest

Review URL: http://codereview.chromium.org/6623057

TBR=jstritar@chromium.org
Review URL: http://codereview.chromium.org/6713007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78575 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 5 insertions, 51 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");
-}
diff --git a/chrome/browser/extensions/extension_management_browsertest.cc b/chrome/browser/extensions/extension_management_browsertest.cc
index 6b0f73c..bd0061ae 100644
--- a/chrome/browser/extensions/extension_management_browsertest.cc
+++ b/chrome/browser/extensions/extension_management_browsertest.cc
@@ -124,18 +124,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, InstallThenCancel) {
 
 // Tests that installing and uninstalling extensions don't crash with an
 // incognito window open.
-IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, FLAKY_Incognito) {
-  LOG(INFO) << "Incognito test started.";
+IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, Incognito) {
   // Open an incognito window to the extensions management page.  We just
   // want to make sure that we don't crash while playing with extensions when
   // this guy is around.
   ui_test_utils::OpenURLOffTheRecord(browser()->profile(),
                                      GURL(chrome::kChromeUIExtensionsURL));
-  LOG(INFO) << "Extensions UI page loaded.";
+
   ASSERT_TRUE(InstallExtension(test_data_dir_.AppendASCII("good.crx"), 1));
-  LOG(INFO) << "Test extension installed.";
   UninstallExtension("ldnnhddmnhbkjipkidpdiheffobcpfmf");
-  LOG(INFO) << "Test extension uninstalled.";
 }
 
 // Tests the process of updating an extension to one that requires higher
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index 2902aad..6a0955d 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -32,7 +32,6 @@
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/extension_icon_source.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -177,10 +176,6 @@ class OffTheRecordProfileImpl : public Profile,
 #if defined(OS_CHROMEOS)
     GetRequestContext();
 #endif  // defined(OS_CHROMEOS)
-
-    // Make the chrome//extension-icon/ resource available.
-    ExtensionIconSource* icon_source = new ExtensionIconSource(real_profile);
-    GetChromeURLDataManager()->AddDataSource(icon_source);
   }
 
   virtual ~OffTheRecordProfileImpl() {
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index e052ecd..6beb537 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -396,8 +396,9 @@ void ProfileImpl::InitExtensions() {
     extensions_service_->LoadExtension(path);
   }
 
-  // Make the chrome://extension-icon/ resource available.
-  GetChromeURLDataManager()->AddDataSource(new ExtensionIconSource(this));
+  // Make the chrome://extension-icon/ resource is available.
+  ExtensionIconSource* icon_source = new ExtensionIconSource(this);
+  GetChromeURLDataManager()->AddDataSource(icon_source);
 }
 
 void ProfileImpl::RegisterComponentExtensions() {
diff --git a/chrome/test/data/extensions/api_test/icons/extension_no_permission/manifest.json b/chrome/test/data/extensions/api_test/icons/extension_no_permission/manifest.json
index 2833a1c..8b56002 100644
--- a/chrome/test/data/extensions/api_test/icons/extension_no_permission/manifest.json
+++ b/chrome/test/data/extensions/api_test/icons/extension_no_permission/manifest.json
@@ -4,7 +4,6 @@
   "name": "test",
   "version": "0.1",
   "permissions": [],
-  "incognito": "split",
   "icons": {
     "24": "24.png"
   }
diff --git a/chrome/test/data/extensions/api_test/icons/extension_with_permission/manifest.json b/chrome/test/data/extensions/api_test/icons/extension_with_permission/manifest.json
index ea4d279..e2bb86e 100644
--- a/chrome/test/data/extensions/api_test/icons/extension_with_permission/manifest.json
+++ b/chrome/test/data/extensions/api_test/icons/extension_with_permission/manifest.json
@@ -4,7 +4,6 @@
   "name": "test",
   "version": "0.1",
   "permissions": [ "management" ],
-  "incognito": "split",
   "icons": {
     "128": "128.png",
     "32": "32.png",