Revert of Turn GoogleURLTrackerNavigationHelper(Impl) into a per-tab object.

chrome/browser/google/google_url_tracker_map_entry.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_map_entry.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 
 
 GoogleURLTrackerMapEntry::GoogleURLTrackerMapEntry(
     GoogleURLTracker* google_url_tracker,
     InfoBarService* infobar_service,
-    scoped_ptr<GoogleURLTrackerNavigationHelper> navigation_helper)
+    const content::NavigationController* navigation_controller)
     : google_url_tracker_(google_url_tracker),
       infobar_service_(infobar_service),
       infobar_delegate_(NULL),
-      navigation_helper_(navigation_helper.Pass()) {
+      navigation_controller_(navigation_controller) {
 }
 
 GoogleURLTrackerMapEntry::~GoogleURLTrackerMapEntry() {
 }
 
 void GoogleURLTrackerMapEntry::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(infobar_delegate_);
@@ skipping 17 matching lines @@
 void GoogleURLTrackerMapEntry::Close(bool redo_search) {
   if (infobar_delegate_) {
     infobar_delegate_->Close(redo_search);
   } else {
     // WARNING: |infobar_service_| may point to a deleted object.  Do not
     // dereference it!  See GoogleURLTracker::OnTabClosed().
     google_url_tracker_->DeleteMapEntryForService(infobar_service_);
   }
   // WARNING: At this point |this| has been deleted!
 }