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

chrome/browser/safe_browsing/malware_details.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.
 //
 // Implementation of the MalwareDetails class.
 
 #include "chrome/browser/safe_browsing/malware_details.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/malware_details_cache.h"
 #include "chrome/browser/safe_browsing/malware_details_history.h"
 #include "chrome/browser/safe_browsing/report.pb.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/navigation_entry.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/web_contents.h"
 #include "net/base/io_buffer.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserThread;
+using content::WebContents;
 using safe_browsing::ClientMalwareReportRequest;
 
 // Keep in sync with KMaxNodes in renderer/safe_browsing/malware_dom_details
 static const uint32 kMaxDomNodes = 500;
 
 // static
 MalwareDetailsFactory* MalwareDetails::factory_ = NULL;
 
 // The default MalwareDetailsFactory.  Global, made a singleton so we
 // don't leak it.
 class MalwareDetailsFactoryImpl
     : public MalwareDetailsFactory {
  public:
   MalwareDetails* CreateMalwareDetails(
       SafeBrowsingService* sb_service,
-      TabContents* tab_contents,
+      WebContents* web_contents,
       const SafeBrowsingService::UnsafeResource& unsafe_resource) {
-    return new MalwareDetails(sb_service, tab_contents, unsafe_resource);
+    return new MalwareDetails(sb_service, web_contents, unsafe_resource);
   }
 
  private:
   friend struct base::DefaultLazyInstanceTraits<
       MalwareDetailsFactoryImpl>;
 
   MalwareDetailsFactoryImpl() { }
 
   DISALLOW_COPY_AND_ASSIGN(MalwareDetailsFactoryImpl);
 };
 
 static base::LazyInstance<MalwareDetailsFactoryImpl>
     g_malware_details_factory_impl = LAZY_INSTANCE_INITIALIZER;
 
 // Create a MalwareDetails for the given tab.
 /* static */
 MalwareDetails* MalwareDetails::NewMalwareDetails(
     SafeBrowsingService* sb_service,
-    TabContents* tab_contents,
+    WebContents* web_contents,
     const SafeBrowsingService::UnsafeResource& resource) {
   // Set up the factory if this has not been done already (tests do that
   // before this method is called).
   if (!factory_)
     factory_ = g_malware_details_factory_impl.Pointer();
-  return factory_->CreateMalwareDetails(sb_service, tab_contents, resource);
+  return factory_->CreateMalwareDetails(sb_service, web_contents, resource);
 }
 
 // Create a MalwareDetails for the given tab. Runs in the UI thread.
 MalwareDetails::MalwareDetails(
     SafeBrowsingService* sb_service,
-    TabContents* tab_contents,
+    content::WebContents* web_contents,
     const SafeBrowsingService::UnsafeResource& resource)
-    : content::WebContentsObserver(tab_contents),
-      profile_(Profile::FromBrowserContext(tab_contents->GetBrowserContext())),
+    : content::WebContentsObserver(web_contents),
+      profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())),
       request_context_getter_(profile_->GetRequestContext()),
       sb_service_(sb_service),
       resource_(resource),
       cache_result_(false),
       cache_collector_(new MalwareDetailsCacheCollector),
       redirects_collector_(
           new MalwareDetailsRedirectsCollector(profile_)) {
   StartCollection();
 }
 
@@ skipping 65 matching lines @@
 }
 
 void MalwareDetails::StartCollection() {
   DVLOG(1) << "Starting to compute malware details.";
   report_.reset(new ClientMalwareReportRequest());
 
   if (IsPublicUrl(resource_.url)) {
     report_->set_malware_url(resource_.url.spec());
   }
 
-  GURL page_url = tab_contents()->GetURL();
+  GURL page_url = web_contents()->GetURL();
   if (IsPublicUrl(page_url)) {
     report_->set_page_url(page_url.spec());
   }
 
   GURL referrer_url;
-  NavigationEntry* nav_entry = tab_contents()->GetController().GetActiveEntry();
+  NavigationEntry* nav_entry = web_contents()->GetController().GetActiveEntry();
   if (nav_entry) {
     referrer_url = nav_entry->GetReferrer().url;
     if (IsPublicUrl(referrer_url)) {
       report_->set_referrer_url(referrer_url.spec());
     }
   }
 
   // Add the nodes, starting from the page url.
   AddUrl(page_url, GURL(), "", NULL);
 
@@ skipping 22 matching lines @@
     parent_url = resource_.redirect_urls[i];
   }
 
   // Add the referrer url.
   if (nav_entry && !referrer_url.is_empty()) {
     AddUrl(referrer_url, GURL(), "", NULL);
   }
 
   // Get URLs of frames, scripts etc from the DOM.
   // OnReceivedMalwareDOMDetails will be called when the renderer replies.
-  RenderViewHost* view = tab_contents()->GetRenderViewHost();
+  RenderViewHost* view = web_contents()->GetRenderViewHost();
   view->Send(new SafeBrowsingMsg_GetMalwareDOMDetails(view->routing_id()));
 }
 
 // When the renderer is done, this is called.
 void MalwareDetails::OnReceivedMalwareDOMDetails(
     const std::vector<SafeBrowsingHostMsg_MalwareDOMDetails_Node>& params) {
   // Schedule this in IO thread, so it doesn't conflict with future users
   // of our data structures (eg GetSerializedReport).
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ skipping 79 matching lines @@
 
   // Send the report, using the SafeBrowsingService.
   std::string serialized;
   if (!report_->SerializeToString(&serialized)) {
     DLOG(ERROR) << "Unable to serialize the malware report.";
     return;
   }
 
   sb_service_->SendSerializedMalwareDetails(serialized);
 }