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

chrome/browser/ui/bookmarks/bookmark_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/bookmarks/bookmark_tab_helper.h"
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
@@ skipping 24 matching lines @@
   registrar_.Add(this, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
                  content::NotificationService::AllBrowserContextsAndSources());
 }
 
 BookmarkTabHelper::~BookmarkTabHelper() {
   // We don't want any notifications while we're running our destructor.
   registrar_.RemoveAll();
 }
 
 bool BookmarkTabHelper::ShouldShowBookmarkBar() {
-  if (tab_contents()->ShowingInterstitialPage())
+  if (web_contents()->ShowingInterstitialPage())
     return false;
 
   // See TabContents::GetWebUIForCurrentState() comment for more info. This case
   // is very similar, but for non-first loads, we want to use the committed
   // entry. This is so the bookmarks bar disappears at the same time the page
   // does.
-  if (tab_contents()->GetController().GetLastCommittedEntry()) {
+  if (web_contents()->GetController().GetLastCommittedEntry()) {
     // Not the first load, always use the committed Web UI.
-    return CanShowBookmarkBar(tab_contents()->GetCommittedWebUI());
+    return CanShowBookmarkBar(web_contents()->GetCommittedWebUI());
   }
 
   // When it's the first load, we know either the pending one or the committed
   // one will have the Web UI in it (see GetWebUIForCurrentState), and only one
   // of them will be valid, so we can just check both.
-  return CanShowBookmarkBar(tab_contents()->GetWebUI());
+  return CanShowBookmarkBar(web_contents()->GetWebUI());
 }
 
 void BookmarkTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& /*details*/,
     const content::FrameNavigateParams& /*params*/) {
   UpdateStarredStateForCurrentURL();
 }
 
 void BookmarkTabHelper::Observe(int type,
                                 const content::NotificationSource& source,
@@ skipping 23 matching lines @@
   bookmark_drag_ = bookmark_drag;
 }
 
 BookmarkTabHelper::BookmarkDrag*
     BookmarkTabHelper::GetBookmarkDragDelegate() {
   return bookmark_drag_;
 }
 
 void BookmarkTabHelper::UpdateStarredStateForCurrentURL() {
   Profile* profile =
-      Profile::FromBrowserContext(tab_contents()->GetBrowserContext());
+      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   BookmarkModel* model = profile->GetBookmarkModel();
   const bool old_state = is_starred_;
-  is_starred_ = (model && model->IsBookmarked(tab_contents()->GetURL()));
+  is_starred_ = (model && model->IsBookmarked(web_contents()->GetURL()));
 
   if (is_starred_ != old_state && delegate())
     delegate()->URLStarredChanged(tab_contents_wrapper_, is_starred_);
 }