Switch AlternateErrorPageTabObserver to use WebContentsUserData.

chrome/browser/ui/alternate_error_tab_observer.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/alternate_error_tab_observer.h"
 
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::RenderViewHost;
 using content::WebContents;
 
+int AlternateErrorPageTabObserver::kUserDataKey;
+
 AlternateErrorPageTabObserver::AlternateErrorPageTabObserver(
-    WebContents* web_contents,
-    Profile* profile)
+    WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      profile_(profile) {
+      profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) {
   PrefService* prefs = profile_->GetPrefs();
   if (prefs) {
     pref_change_registrar_.Init(prefs);
     pref_change_registrar_.Add(prefs::kAlternateErrorPagesEnabled, this);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
                  content::Source<Profile>(profile_->GetOriginalProfile()));
 }
 
@@ skipping 10 matching lines @@
 // WebContentsObserver overrides
 
 void AlternateErrorPageTabObserver::RenderViewCreated(
     RenderViewHost* render_view_host) {
   UpdateAlternateErrorPageURL(render_view_host);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // content::NotificationObserver overrides
 
-void AlternateErrorPageTabObserver::Observe(int type,
-                            const content::NotificationSource& source,
-                            const content::NotificationDetails& details) {
+void AlternateErrorPageTabObserver::Observe(
+    int type,
+    const content::NotificationSource& source,
+    const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     DCHECK_EQ(profile_->GetPrefs(), content::Source<PrefService>(source).ptr());
     DCHECK_EQ(std::string(prefs::kAlternateErrorPagesEnabled),
               *content::Details<std::string>(details).ptr());
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_URL_UPDATED, type);
   }
   UpdateAlternateErrorPageURL(web_contents()->GetRenderViewHost());
 }
 
@@ skipping 13 matching lines @@
     url = google_util::AppendGoogleLocaleParam(url);
     url = google_util::AppendGoogleTLDParam(profile_, url);
   }
   return url;
 }
 
 void AlternateErrorPageTabObserver::UpdateAlternateErrorPageURL(
     RenderViewHost* rvh) {
   rvh->SetAltErrorPageURL(GetAlternateErrorPageURL());
 }