Replace extension disabled infobar with a global error.

chrome/browser/extensions/extension_management_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/autoupdate_interceptor.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 41 matching lines @@
         ext_host->render_view_host(), L"", L"version()", &version_from_bg);
     EXPECT_TRUE(exec);
     if (!exec)
       return false;
 
     if (version_from_bg != expected_version ||
         extension->VersionString() != expected_version)
       return false;
     return true;
   }
-
-  // Helper method that installs a low permission extension then updates
-  // to the second version requiring increased permissions. Returns whether
-  // the operation was completed successfully.
-  bool InstallAndUpdateIncreasingPermissionsExtension() {
-    ExtensionService* service = browser()->profile()->GetExtensionService();
-    size_t size_before = service->extensions()->size();
-
-    // Install the initial version, which should happen just fine.
-    const Extension* extension = InstallExtension(
-        test_data_dir_.AppendASCII("permissions-low-v1.crx"), 1);
-    if (!extension)
-      return false;
-    if (service->extensions()->size() != size_before + 1)
-      return false;
-
-    // Upgrade to a version that wants more permissions. We should disable the
-    // extension and prompt the user to reenable.
-    if (UpdateExtension(
-            extension->id(),
-            test_data_dir_.AppendASCII("permissions-high-v2.crx"), -1))
-      return false;
-    EXPECT_EQ(size_before, service->extensions()->size());
-    if (service->disabled_extensions()->size() != 1u)
-      return false;
-    return true;
-  }
 };
 
 #if defined(OS_LINUX)
 // Times out sometimes on Linux.  http://crbug.com/89727
 #define MAYBE_InstallSameVersion DISABLED_InstallSameVersion
 #else
 #define MAYBE_InstallSameVersion InstallSameVersion
 #endif
 
 // Tests that installing the same version overwrites.
@@ skipping 42 matching lines @@
   ASSERT_FALSE(InstallExtension(test_data_dir_.AppendASCII("good.crx"), 0));
   ASSERT_TRUE(service->GetExtensionById(id, true));
   UninstallExtension(id);
 
   // And the install should succeed when the permissions are accepted.
   ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(
       test_data_dir_.AppendASCII("good.crx"), 1, browser()->profile()));
   UninstallExtension(id);
 }
 
-// Tests the process of updating an extension to one that requires higher
-// permissions.
-IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UpdatePermissions) {
-  ExtensionService* service = browser()->profile()->GetExtensionService();
-  ASSERT_TRUE(InstallAndUpdateIncreasingPermissionsExtension());
-  const size_t size_before = service->extensions()->size();
-
-  // Now try reenabling it.
-  const std::string id = (*service->disabled_extensions()->begin())->id();
-  service->EnableExtension(id);
-  EXPECT_EQ(size_before + 1, service->extensions()->size());
-  EXPECT_EQ(0u, service->disabled_extensions()->size());
-}
-
-// Tests uninstalling an extension that was disabled due to higher permissions.
-IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UpdatePermissionsAndUninstall) {
-  ASSERT_TRUE(InstallAndUpdateIncreasingPermissionsExtension());
-
-  // Make sure the "disable extension" infobar is present.
-  ASSERT_EQ(0, browser()->active_index());
-  InfoBarTabHelper* infobar_helper = browser()->GetTabContentsWrapperAt(0)->
-      infobar_tab_helper();
-  ASSERT_EQ(1U, infobar_helper->infobar_count());
-
-  // Uninstall, and check that the infobar went away.
-  ExtensionService* service = browser()->profile()->GetExtensionService();
-  std::string id = (*service->disabled_extensions()->begin())->id();
-  UninstallExtension(id);
-  ASSERT_EQ(0U, infobar_helper->infobar_count());
-
-  // Now select a new tab, and switch back to the first tab which had the
-  // infobar. We should not crash.
-  ASSERT_EQ(1, browser()->tab_count());
-  ASSERT_EQ(0, browser()->active_index());
-  browser()->NewTab();
-  ASSERT_EQ(2, browser()->tab_count());
-  ASSERT_EQ(1, browser()->active_index());
-  browser()->ActivateTabAt(0, true);
-}
-
-// Tests that we can uninstall a disabled extension.
-IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, UninstallDisabled) {
-  ExtensionService* service = browser()->profile()->GetExtensionService();
-  ASSERT_TRUE(InstallAndUpdateIncreasingPermissionsExtension());
-  const size_t size_before = service->extensions()->size();
-
-  // Now try uninstalling it.
-  UninstallExtension((*service->disabled_extensions()->begin())->id());
-  EXPECT_EQ(size_before, service->extensions()->size());
-  EXPECT_EQ(0u, service->disabled_extensions()->size());
-}
-
 // Tests that disabling and re-enabling an extension works.
 IN_PROC_BROWSER_TEST_F(ExtensionManagementTest, DisableEnable) {
   ExtensionProcessManager* manager = browser()->profile()->
       GetExtensionProcessManager();
   ExtensionService* service = browser()->profile()->GetExtensionService();
   const size_t size_before = service->extensions()->size();
 
   // Load an extension, expect the background page to be available.
   std::string extension_id = "bjafgdebaacbbbecmhlhpofkepfkgcpa";
   ASSERT_TRUE(LoadExtension(
@@ skipping 386 matching lines @@
         std::string(kExtensionId) + ";http://localhost/autoupdate/manifest"));
   }
   ASSERT_TRUE(WaitForExtensionInstall());
   ASSERT_EQ(size_before + 1, service->extensions()->size());
   extension = service->GetExtensionById(kExtensionId, false);
   ASSERT_TRUE(extension);
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
   EXPECT_TRUE(service->disabled_extensions()->is_empty());
 }