Move most of the remaining users of WebContentsObserver::tab_contents() to use web_contents().

chrome/browser/ui/prefs/prefs_tab_helper.cc

 // Copyright (c) 2011 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/prefs/prefs_tab_helper.h"
 
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
+#include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/locale_settings.h"
 #include "grit/platform_locale_settings.h"
 #include "webkit/glue/webpreferences.h"
 
 using content::WebContents;
 
 namespace {
 
 const char* kPerTabPrefsToObserve[] = {
     prefs::kWebKitJavascriptEnabled
@@ skipping 173 matching lines @@
 #if defined(OS_CHROMEOS) || defined(OS_MACOSX) || defined(OS_WIN)
 // To avoid Clang warning, only define kPerScriptFontDefaultsLength when it is
 // non-zero.  When it is zero, code like
 //  for (size_t i = 0; i < kPerScriptFontDefaultsLength; ++i)
 // causes a warning due to comparison of unsigned expression < 0.
 const size_t kPerScriptFontDefaultsLength = arraysize(kPerScriptFontDefaults);
 #endif
 
 }  // namespace
 
-PrefsTabHelper::PrefsTabHelper(TabContents* contents)
-    : content::WebContentsObserver(contents),
-      contents_(contents) {
+PrefsTabHelper::PrefsTabHelper(WebContents* contents)
+    : content::WebContentsObserver(contents) {
   PrefService* prefs = GetProfile()->GetPrefs();
   pref_change_registrar_.Init(prefs);
   if (prefs) {
     for (int i = 0; i < kPrefsToObserveLength; ++i)
       pref_change_registrar_.Add(kPrefsToObserve[i], this);
 
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitStandardFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitFixedFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitSerifFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitSansSerifFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitCursiveFontFamilyMap, this);
     RegisterFontFamilyMapObserver(&pref_change_registrar_,
                                   prefs::kWebKitFantasyFontFamilyMap, this);
   }
 
   per_tab_prefs_.reset(
       GetProfile()->GetPrefs()->CreatePrefServiceWithPerTabPrefStore());
   RegisterPerTabUserPrefs(per_tab_prefs_.get());
   per_tab_pref_change_registrar_.Init(per_tab_prefs_.get());
   for (int i = 0; i < kPerTabPrefsToObserveLength; ++i) {
       per_tab_pref_change_registrar_.Add(kPerTabPrefsToObserve[i], this);
   }
 
   renderer_preferences_util::UpdateFromSystemSettings(
-      tab_contents()->GetMutableRendererPrefs(), GetProfile());
+      web_contents()->GetMutableRendererPrefs(), GetProfile());
 
   registrar_.Add(this, chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED,
                  content::NotificationService::AllSources());
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
 #endif
 }
 
@@ skipping 161 matching lines @@
         NOTREACHED() << "unexpected pref change notification" << *pref_name_in;
       }
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void PrefsTabHelper::UpdateWebPreferences() {
-  RenderViewHostDelegate* rvhd = tab_contents();
+  RenderViewHostDelegate* rvhd =
+      web_contents()->GetRenderViewHost()->delegate();
   WebPreferences prefs = rvhd->GetWebkitPrefs();
   prefs.javascript_enabled =
       per_tab_prefs_->GetBoolean(prefs::kWebKitJavascriptEnabled);
-  tab_contents()->GetRenderViewHost()->UpdateWebkitPreferences(prefs);
+  web_contents()->GetRenderViewHost()->UpdateWebkitPreferences(prefs);
 }
 
 void PrefsTabHelper::UpdateRendererPreferences() {
   renderer_preferences_util::UpdateFromSystemSettings(
-      tab_contents()->GetMutableRendererPrefs(), GetProfile());
-  tab_contents()->GetRenderViewHost()->SyncRendererPrefs();
+      web_contents()->GetMutableRendererPrefs(), GetProfile());
+  web_contents()->GetRenderViewHost()->SyncRendererPrefs();
 }
 
 Profile* PrefsTabHelper::GetProfile() {
-  return Profile::FromBrowserContext(contents_->GetBrowserContext());
+  return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
 }