Make WebContentsObserver::web_contents() public

chrome/browser/prerender/prerender_manager.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/prerender/prerender_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <string>
 #include <vector>
@@ skipping 1050 matching lines @@
       seen_target_route_id_(false),
       swap_successful_(false),
       weak_factory_(this) {
 }
 
 PrerenderManager::PendingSwap::~PendingSwap() {
   manager_->prerender_tracker()->RemovePrerenderPendingSwap(
       target_route_id_, swap_successful_);
 }
 
-WebContents* PrerenderManager::PendingSwap::target_contents() const {
-  return web_contents();
-}
-
 void PrerenderManager::PendingSwap::BeginSwap() {
   if (g_hang_session_storage_merges_for_testing)
     return;
 
   SessionStorageNamespace* target_namespace =
-      target_contents()->GetController().GetDefaultSessionStorageNamespace();
+      web_contents()->GetController().GetDefaultSessionStorageNamespace();
   SessionStorageNamespace* prerender_namespace =
       prerender_data_->contents()->GetSessionStorageNamespace();
 
   prerender_namespace->Merge(
       true, prerender_data_->contents()->child_id(),
       target_namespace,
       base::Bind(&PrerenderManager::PendingSwap::OnMergeCompleted,
                  weak_factory_.GetWeakPtr()));
 
   merge_timeout_.Start(
@@ skipping 100 matching lines @@
   RecordEvent(PRERENDER_EVENT_MERGE_RESULT_SWAPPING_IN);
 
   // Note that SwapInternal will, on success, delete |prerender_data_| and
   // |this|. It will also delete |this| in some failure cases. Pass in a new
   // GURL object rather than a reference to |url_|. Also hold on to |manager_|
   // and |prerender_data_|.
   //
   // TODO(davidben): Can we make this less fragile?
   PrerenderManager* manager = manager_;
   PrerenderData* prerender_data = prerender_data_;
-  WebContents* new_web_contents = manager_->SwapInternal(
-        GURL(url_), target_contents(), prerender_data_,
-        should_replace_current_entry_);
+  WebContents* new_web_contents =
+      manager_->SwapInternal(GURL(url_),
+                             web_contents(),
+                             prerender_data_,
+                             should_replace_current_entry_);
   if (!new_web_contents) {
     manager->RecordEvent(prerender_data->contents(),
                          PRERENDER_EVENT_MERGE_RESULT_SWAPIN_FAILED);
     // Depending on whether SwapInternal called Destroy() or simply failed to
     // swap, |this| may or may not be deleted. Either way, if the swap failed,
     // |prerender_data| is deleted asynchronously, so this call is a no-op if
     // |this| is already gone.
     prerender_data->ClearPendingSwap();
   }
 }
@@ skipping 281 matching lines @@
   }
   return NULL;
 }
 
 PrerenderManager::PrerenderData*
 PrerenderManager::FindPrerenderDataForTargetContents(
     WebContents* target_contents) {
   for (ScopedVector<PrerenderData>::iterator it = active_prerenders_.begin();
        it != active_prerenders_.end(); ++it) {
     if ((*it)->pending_swap() &&
-        (*it)->pending_swap()->target_contents() == target_contents)
+        (*it)->pending_swap()->web_contents() == target_contents)
       return *it;
   }
   return NULL;
 }
 
 ScopedVector<PrerenderManager::PrerenderData>::iterator
 PrerenderManager::FindIteratorForPrerenderContents(
     PrerenderContents* prerender_contents) {
   for (ScopedVector<PrerenderData>::iterator it = active_prerenders_.begin();
        it != active_prerenders_.end(); ++it) {
@@ skipping 386 matching lines @@
     content::RenderProcessHost* host) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   prerender_process_hosts_.erase(host);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&PrerenderTracker::RemovePrerenderCookieStoreOnIOThread,
                  base::Unretained(prerender_tracker()), host->GetID(), false));
 }
 
 }  // namespace prerender