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_map_entry.cc

Index: chrome/browser/google/google_url_tracker_map_entry.cc
===================================================================
--- chrome/browser/google/google_url_tracker_map_entry.cc	(revision 165800)
+++ chrome/browser/google/google_url_tracker_map_entry.cc	(working copy)
@@ -47,9 +47,12 @@
 }
 
 void GoogleURLTrackerMapEntry::Close(bool redo_search) {
-  if (infobar_)
+  if (infobar_) {
     infobar_->Close(redo_search);
-  else
+  } else {
+    // WARNING: |infobar_helper_| may point to a deleted object.  Do not
+    // dereference it!  See GoogleURLTracker::OnTabClosed().
     google_url_tracker_->DeleteMapEntryForHelper(infobar_helper_);
+  }
   // WARNING: At this point |this| has been deleted!
 }