Replace most of Browser::GetSelectedTabContents calls into Browser::GetSelectedWebContents. I've ...

chrome/browser/safe_browsing/safe_browsing_service_browsertest.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.
 //
 // This test creates a safebrowsing service using test safebrowsing database
 // and a test protocol manager. It is used to test logics in safebrowsing
 // service.
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 17 matching lines @@
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/test/test_browser_thread.h"
 #include "crypto/sha2.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using base::Histogram;
 using base::StatisticsRecorder;
 using content::BrowserThread;
-
+using content::WebContents;
 using ::testing::_;
 using ::testing::Mock;
 using ::testing::StrictMock;
 
 // A SafeBrowingDatabase class that allows us to inject the malicious URLs.
 class TestSafeBrowsingDatabase :  public SafeBrowsingDatabase {
  public:
   TestSafeBrowsingDatabase() {}
 
   virtual ~TestSafeBrowsingDatabase() {}
@@ skipping 325 matching lines @@
     TestSafeBrowsingDatabase* db = db_factory_.GetDb();
     SBFullHash full_hash;
     safe_browsing_util::StringToSBFullHash(digest, &full_hash);
     db->AddDownloadPrefix(full_hash.prefix);
 
     TestProtocolManager* pm = pm_factory_.GetProtocolManager();
     pm->SetGetFullHashResponse(hash_result);
   }
 
   bool ShowingInterstitialPage() {
-    TabContents* contents = browser()->GetSelectedTabContents();
+    WebContents* contents = browser()->GetSelectedWebContents();
     InterstitialPage* interstitial_page = contents->GetInterstitialPage();
     return interstitial_page != NULL;
   }
 
   void IntroduceGetHashDelay(int64 ms) {
     pm_factory_.GetProtocolManager()->IntroduceDelay(ms);
   }
 
   int64 DownloadUrlCheckTimeout(SafeBrowsingService* sb_service) {
     return sb_service->download_urlcheck_timeout_ms_;
@@ skipping 368 matching lines @@
 
   // Delete the Profile. SBS stops again.
   pref_service2 = NULL;
   profile2.reset();
   WaitForIOThread();
   EXPECT_FALSE(sb_service->enabled());
   EXPECT_FALSE(csd_service->enabled());
 }
 
 }  // namespace