Switch WebNavigationTabObserver to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.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/ui/tab_contents/tab_contents.h"
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
@@ skipping 114 matching lines @@
     autocomplete_history_manager_->SetExternalDelegate(
         autofill_external_delegate_.get());
   }
   blocked_content_tab_helper_.reset(new BlockedContentTabHelper(this));
   BookmarkTabHelper::CreateForWebContents(contents);
   chrome_browser_net::LoadTimeStatsTabHelper::CreateForWebContents(contents);
   constrained_window_tab_helper_.reset(new ConstrainedWindowTabHelper(this));
   content_settings_.reset(new TabSpecificContentSettings(contents));
   CoreTabHelper::CreateForWebContents(contents);
   extensions::TabHelper::CreateForWebContents(contents);
+  extensions::WebNavigationTabObserver::CreateForWebContents(contents);
   favicon_tab_helper_.reset(new FaviconTabHelper(contents));
   find_tab_helper_.reset(new FindTabHelper(contents));
   history_tab_helper_.reset(new HistoryTabHelper(contents));
   hung_plugin_tab_helper_.reset(new HungPluginTabHelper(contents));
   infobar_tab_helper_.reset(new InfoBarTabHelper(contents));
   MetroPinTabHelper::CreateForWebContents(contents);
   password_manager_delegate_.reset(new PasswordManagerDelegateImpl(this));
   password_manager_.reset(
       new PasswordManager(contents, password_manager_delegate_.get()));
   prefs_tab_helper_.reset(new PrefsTabHelper(contents));
@@ skipping 21 matching lines @@
   SadTabHelper::CreateForWebContents(contents);
   web_intent_picker_controller_.reset(new WebIntentPickerController(this));
 #endif
 
   external_protocol_observer_.reset(new ExternalProtocolObserver(contents));
   navigation_metrics_recorder_.reset(new NavigationMetricsRecorder(contents));
   pepper_broker_observer_.reset(new PepperBrokerObserver(contents));
   plugin_observer_.reset(new PluginObserver(this));
   safe_browsing_tab_observer_.reset(
       new safe_browsing::SafeBrowsingTabObserver(this));
-    webnavigation_observer_.reset(
-        new extensions::WebNavigationTabObserver(contents));
 
 #if defined(ENABLE_PRINTING)
   printing::PrintPreviewMessageHandler::CreateForWebContents(contents);
   printing::PrintViewManager::CreateForWebContents(contents);
 #endif
 
   // Start the in-browser thumbnailing if the feature is enabled.
   if (ShouldEnableInBrowserThumbnailing()) {
     thumbnail_generator_.reset(new ThumbnailGenerator);
     thumbnail_generator_->StartThumbnailing(web_contents_.get());
@@ skipping 54 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebContentsObserver overrides
 
 void TabContents::WebContentsDestroyed(WebContents* tab) {
   // Destruction of the WebContents should only be done by us from our
   // destructor. Otherwise it's very likely we (or one of the helpers we own)
   // will attempt to access the WebContents and we'll crash.
   DCHECK(in_destructor_);
 }