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

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc
===================================================================
--- chrome/browser/geolocation/geolocation_permission_context_unittest.cc	(revision 87541)
+++ chrome/browser/geolocation/geolocation_permission_context_unittest.cc	(working copy)
@@ -51,7 +51,7 @@
     : 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);
 }
@@ -63,10 +63,12 @@
     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