Move infobar handling to a tab helper.

chrome/browser/extensions/extension_management_browsertest.cc

 // Copyright (c) 2011 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"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/extension_updater.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ skipping 147 matching lines @@
   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());
-  TabContentsWrapper* wrapper = browser()->GetTabContentsWrapperAt(0);
-  ASSERT_EQ(1U, wrapper->infobar_count());
+  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()->at(0)->id();
   UninstallExtension(id);
-  ASSERT_EQ(0U, wrapper->infobar_count());
+  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);
 }
@@ skipping 414 matching lines @@
   }
   ASSERT_TRUE(WaitForExtensionInstall());
   extensions = service->extensions();
   ASSERT_EQ(size_before + 1, extensions->size());
   extension = extensions->at(size_before);
   ASSERT_EQ(kExtensionId, extension->id());
   EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());
   EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));
   EXPECT_TRUE(service->disabled_extensions()->empty());
 }