More misc. cleanups to minimize future refactoring diffs.

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;
 
 AlternateErrorPageTabObserver::AlternateErrorPageTabObserver(
-    WebContents* web_contents)
-    : content::WebContentsObserver(web_contents) {
-  PrefService* prefs = GetProfile()->GetPrefs();
+    WebContents* web_contents,
+    Profile* profile)
+    : content::WebContentsObserver(web_contents),
+      profile_(profile) {
+  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::NotificationService::AllSources());
 }
 
 AlternateErrorPageTabObserver::~AlternateErrorPageTabObserver() {
 }
 
 // static
 void AlternateErrorPageTabObserver::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled,
-                             true,
+  prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true,
                              PrefService::SYNCABLE_PREF);
 }
 
-Profile* AlternateErrorPageTabObserver::GetProfile() const {
- return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // 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) {
-  switch (type) {
-    case chrome::NOTIFICATION_GOOGLE_URL_UPDATED:
-      UpdateAlternateErrorPageURL(web_contents()->GetRenderViewHost());
-      break;
-    case chrome::NOTIFICATION_PREF_CHANGED: {
-      std::string* pref_name = content::Details<std::string>(details).ptr();
-      DCHECK(content::Source<PrefService>(source).ptr() ==
-             GetProfile()->GetPrefs());
-      if (*pref_name == prefs::kAlternateErrorPagesEnabled) {
-        UpdateAlternateErrorPageURL(web_contents()->GetRenderViewHost());
-      } else {
-        NOTREACHED() << "unexpected pref change notification" << *pref_name;
-      }
-      break;
-    }
-    default:
-      NOTREACHED();
+  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());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Internal helpers
 
 GURL AlternateErrorPageTabObserver::GetAlternateErrorPageURL() const {
   GURL url;
   // Disable alternate error pages when in Incognito mode.
-  Profile* profile = GetProfile();
-  if (profile->IsOffTheRecord())
+  if (profile_->IsOffTheRecord())
     return url;
 
-  if (profile->GetPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled)) {
+  if (profile_->GetPrefs()->GetBoolean(prefs::kAlternateErrorPagesEnabled)) {
     url = google_util::AppendGoogleLocaleParam(
         GURL(google_util::kLinkDoctorBaseURL));
     url = google_util::AppendGoogleTLDParam(url);
   }
   return url;
 }
 
 void AlternateErrorPageTabObserver::UpdateAlternateErrorPageURL(
     RenderViewHost* rvh) {
   rvh->SetAltErrorPageURL(GetAlternateErrorPageURL());
 }