Merge 165468 - Fix a crash that could occur if the user closed a tab with an uncommitted search nav…

chrome/browser/google/google_url_tracker_unittest.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 "chrome/browser/google/google_url_tracker.h"
 
 #include <set>
 #include <string>
 
 #include "base/message_loop.h"
@@ skipping 74 matching lines @@
 }  // namespace
 
 
 // GoogleURLTrackerTest -------------------------------------------------------
 
 // Ths class exercises GoogleURLTracker.  In order to avoid instantiating more
 // of the Chrome infrastructure than necessary, the GoogleURLTracker functions
 // are carefully written so that many of the functions which take WebContents*,
 // NavigationController*, InfoBarTabHelper*, or objects containing such pointers
 // (e.g. NotificationSource) do not actually dereference the objects, merely use
-// them for comparisons and lookups, e.g. in an InfoBarMap.  This then allows
-// the test code here to not create any of these objects, and instead supply
+// them for comparisons and lookups, e.g. in |entry_map_|.  This then allows the
+// test code here to not create any of these objects, and instead supply
 // "pointers" that are actually reinterpret_cast<>()ed magic numbers.  Then we
 // write the necessary stubs/hooks, here and in TestInfoBarDelegate above, to
 // make everything continue to work.
 //
 // Technically, the C++98 spec defines the result of casting
 // T* -> intptr_t -> T* to be an identity, but intptr_t -> T* -> intptr_t (what
 // we use here) is "implementation-defined".  Since I've never seen a compiler
 // break this, though, and the result would simply be a failing test rather than
 // a bug in Chrome, we'll use it anyway.
 class GoogleURLTrackerTest : public testing::Test {
@@ skipping 61 matching lines @@
   // This tracks the different "tabs" a test has "opened", so we can close them
   // properly before shutting down |google_url_tracker_|, which expects that.
   std::set<int> unique_ids_seen_;
 };
 
 void GoogleURLTrackerTest::OnInfoBarClosed(
     GoogleURLTrackerInfoBarDelegate* infobar,
     InfoBarTabHelper* infobar_helper) {
   // First, simulate the InfoBarTabHelper firing INFOBAR_REMOVED.
   InfoBarRemovedDetails removed_details(infobar, false);
-  GoogleURLTracker::InfoBarMap::const_iterator i =
-      google_url_tracker_->infobar_map_.find(infobar_helper);
-  ASSERT_FALSE(i == google_url_tracker_->infobar_map_.end());
+  GoogleURLTracker::EntryMap::const_iterator i =
+      google_url_tracker_->entry_map_.find(infobar_helper);
+  ASSERT_FALSE(i == google_url_tracker_->entry_map_.end());
   GoogleURLTrackerMapEntry* map_entry = i->second;
   ASSERT_EQ(infobar, map_entry->infobar());
   map_entry->Observe(chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                      content::Source<InfoBarTabHelper>(infobar_helper),
                      content::Details<InfoBarRemovedDetails>(&removed_details));
 
   // Second, simulate the infobar container closing the infobar in response.
   infobar->InfoBarClosed();
 }
 
@@ skipping 105 matching lines @@
   // The pending_id should have been reset to 0 when the non-search became
   // pending.
   EXPECT_EQ(0, map_entry->infobar()->pending_id());
 
   // Committing the navigation would close the infobar.
   map_entry->infobar()->Close(false);
 }
 
 void GoogleURLTrackerTest::CommitSearch(intptr_t unique_id,
                                         const GURL& search_url) {
+  DCHECK(search_url.is_valid());
   if (google_url_tracker_->registrar_.IsRegistered(google_url_tracker_.get(),
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
       content::Source<content::NavigationController>(
           reinterpret_cast<content::NavigationController*>(unique_id)))) {
-    google_url_tracker_->OnNavigationCommittedOrTabClosed(
+    google_url_tracker_->OnNavigationCommitted(
         reinterpret_cast<InfoBarTabHelper*>(unique_id),
         search_url);
   }
 }
 
 void GoogleURLTrackerTest::DoInstantNavigation(intptr_t unique_id,
                                                const GURL& search_url) {
   if (!search_url.is_empty()) {
     google_url_tracker_->SearchCommitted();
     // Note that the call above might not have actually registered a listener
     // for NOTIFICATION_INSTANT_COMMITTED if the searchdomaincheck response was
     // bogus.
   }
   unique_ids_seen_.insert(unique_id);
   if (google_url_tracker_->registrar_.IsRegistered(google_url_tracker_.get(),
       chrome::NOTIFICATION_INSTANT_COMMITTED,
       content::NotificationService::AllBrowserContextsAndSources())) {
     google_url_tracker_->OnInstantCommitted(
         content::Source<content::NavigationController>(
             reinterpret_cast<content::NavigationController*>(unique_id)),
         content::Source<content::WebContents>(
             reinterpret_cast<content::WebContents*>(unique_id)),
         reinterpret_cast<InfoBarTabHelper*>(unique_id), search_url);
   }
 }
 
 void GoogleURLTrackerTest::CloseTab(intptr_t unique_id) {
   unique_ids_seen_.erase(unique_id);
-  InfoBarTabHelper* infobar_helper =
-      reinterpret_cast<InfoBarTabHelper*>(unique_id);
+  content::Source<content::WebContents> source(
+      reinterpret_cast<content::WebContents*>(unique_id));
   if (google_url_tracker_->registrar_.IsRegistered(
       google_url_tracker_.get(), content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
-      content::Source<content::WebContents>(
-          reinterpret_cast<content::WebContents*>(unique_id)))) {
-    google_url_tracker_->OnNavigationCommittedOrTabClosed(infobar_helper,
-                                                          GURL());
+      source)) {
+    google_url_tracker_->OnTabClosed(source);
   } else {
     // Closing a tab with an infobar showing would close the infobar.
     GoogleURLTrackerInfoBarDelegate* infobar = GetInfoBar(unique_id);
     if (infobar)
       infobar->Close(false);
   }
 }
 
 GoogleURLTrackerMapEntry* GoogleURLTrackerTest::GetMapEntry(
     intptr_t unique_id) {
-  GoogleURLTracker::InfoBarMap::const_iterator i =
-      google_url_tracker_->infobar_map_.find(
+  GoogleURLTracker::EntryMap::const_iterator i =
+      google_url_tracker_->entry_map_.find(
           reinterpret_cast<InfoBarTabHelper*>(unique_id));
-  return (i == google_url_tracker_->infobar_map_.end()) ? NULL : i->second;
+  return (i == google_url_tracker_->entry_map_.end()) ? NULL : i->second;
 }
 
 GoogleURLTrackerInfoBarDelegate* GoogleURLTrackerTest::GetInfoBar(
     intptr_t unique_id) {
   GoogleURLTrackerMapEntry* map_entry = GetMapEntry(unique_id);
   return map_entry ? map_entry->infobar() : NULL;
 }
 
 void GoogleURLTrackerTest::ExpectDefaultURLs() const {
   EXPECT_EQ(GURL(GoogleURLTracker::kDefaultGoogleHomepage), google_url());
@@ skipping 659 matching lines @@
   CommitSearch(2, GURL("http://www.google.co.uk/search?q=test2"));
   EXPECT_FALSE(GetInfoBar(1) == NULL);
   GoogleURLTrackerInfoBarDelegate* infobar2 = GetInfoBar(2);
   ASSERT_FALSE(infobar2 == NULL);
   SetNavigationPending(1, true);
   ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, true));
   infobar2->Close(false);
   SetNavigationPending(1, false);
   ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, false));
 }