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

chrome/browser/translate/translate_manager_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 <set>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
@@ skipping 120 matching lines @@
       return false;
     infobar->TranslationDeclined();
     contents_wrapper()->RemoveInfoBar(infobar);
     return true;
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     DCHECK_EQ(NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, type.value);
-    removed_infobars_.insert(Details<InfoBarDelegate>(details).ptr());
+    removed_infobars_.insert(
+        Details<std::pair<InfoBarDelegate*, bool> >(details)->first);
   }
 
  protected:
   virtual void SetUp() {
     URLFetcher::set_factory(&url_fetcher_factory_);
 
     // Access the TranslateManager singleton so it is created before we call
     // RenderViewHostTestHarness::SetUp() to match what's done in Chrome, where
     // the TranslateManager is created before the TabContents.  This matters as
     // they both register for similar events and we want the notifications to
     // happen in the same sequence (TranslateManager first, TabContents second).
     // Also clears the translate script so it is fetched everytime and sets the
     // expiration delay to a large value by default (in case it was zeroed in
     // a previous test).
     TranslateManager::GetInstance()->ClearTranslateScript();
     TranslateManager::GetInstance()->
         set_translate_script_expiration_delay(60 * 60 * 1000);
 
     TabContentsWrapperTestHarness::SetUp();
 
     notification_registrar_.Add(this,
         NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
-        Source<TabContents>(contents()));
+        Source<TabContentsWrapper>(contents_wrapper()));
   }
 
   virtual void TearDown() {
     process()->sink().ClearMessages();
 
     notification_registrar_.Remove(this,
         NotificationType::TAB_CONTENTS_INFOBAR_REMOVED,
-        Source<TabContents>(contents()));
+        Source<TabContentsWrapper>(contents_wrapper()));
 
     TabContentsWrapperTestHarness::TearDown();
 
     URLFetcher::set_factory(NULL);
   }
 
   void SimulateURLFetch(bool success) {
     TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
     ASSERT_TRUE(fetcher);
     net::URLRequestStatus status;
@@ skipping 1015 matching lines @@
       NULL);
   // Now simulate the URL fetch.
   SimulateURLFetch(true);
   // Now the message should have been sent.
   int page_id = 0;
   std::string original_lang, target_lang;
   EXPECT_TRUE(GetTranslateMessage(&page_id, &original_lang, &target_lang));
   EXPECT_EQ("es", original_lang);
   EXPECT_EQ("en", target_lang);
 }