Change InfoBar-related notifications to be sourced from a TabContentsWrapper, not a TabContents. ...

chrome/browser/geolocation/geolocation_permission_context_unittest.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/scoped_vector.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
@@ skipping 33 matching lines @@
   InfoBarDelegate* removed_infobar_delegate_;
   NotificationRegistrar registrar_;
 };
 
 TestTabContentsWithPendingInfoBar::TestTabContentsWithPendingInfoBar(
     Profile* profile,
     SiteInstance* instance)
     : TabContentsWrapper(
           new TabContents(profile, instance, MSG_ROUTING_NONE, NULL, NULL)),
       removed_infobar_delegate_(NULL) {
-  Source<TabContents> source(tab_contents());
+  Source<TabContentsWrapper> source(this);
   registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
                  source);
 }
 
 TestTabContentsWithPendingInfoBar::~TestTabContentsWithPendingInfoBar() {
 }
 
 void TestTabContentsWithPendingInfoBar::Observe(
     NotificationType type,
     const NotificationSource& source,
     const NotificationDetails& details) {
-  if (type.value == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED)
-    removed_infobar_delegate_ = Details<InfoBarDelegate>(details).ptr();
-  else
+  if (type.value == NotificationType::TAB_CONTENTS_INFOBAR_REMOVED) {
+    removed_infobar_delegate_ =
+        Details<std::pair<InfoBarDelegate*, bool> >(details)->first;
+  } else {
     TabContentsWrapper::Observe(type, source, details);
+  }
 }
 
 }  // namespace
 
 
 // GeolocationPermissionContextTests ------------------------------------------
 
 // This class sets up GeolocationArbitrator.
 class GeolocationPermissionContextTests : public TabContentsWrapperTestHarness {
  public:
@@ skipping 378 matching lines @@
   // Ensure only one infobar is created.
   EXPECT_EQ(1U, contents_wrapper()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
       contents_wrapper()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   string16 text_0 = infobar_0->GetMessageText();
 
   // Delete the tab contents.
   DeleteContents();
 }