TabContentsWrapper -> TabContents, part 2.

chrome/browser/download/download_request_limiter_unittest.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 "base/bind.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::WebContents;
 
-class DownloadRequestLimiterTest : public TabContentsWrapperTestHarness {
+class DownloadRequestLimiterTest : public TabContentsTestHarness {
  public:
   DownloadRequestLimiterTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_user_blocking_thread_(
             BrowserThread::FILE_USER_BLOCKING, &message_loop_),
         io_thread_(BrowserThread::IO, &message_loop_) {
   }
 
   virtual void SetUp() {
-    TabContentsWrapperTestHarness::SetUp();
+    TabContentsTestHarness::SetUp();
 
     allow_download_ = true;
     ask_allow_count_ = cancel_count_ = continue_count_ = 0;
 
     download_request_limiter_ = new DownloadRequestLimiter();
     test_delegate_.reset(new DownloadRequestLimiterTestDelegate(this));
     DownloadRequestLimiter::SetTestingDelegate(test_delegate_.get());
   }
 
   virtual void TearDown() {
     UnsetDelegate();
-    TabContentsWrapperTestHarness::TearDown();
+    TabContentsTestHarness::TearDown();
   }
 
   virtual void UnsetDelegate() {
     DownloadRequestLimiter::SetTestingDelegate(NULL);
   }
 
   void CanDownload() {
     CanDownloadFor(web_contents());
   }
 
@@ skipping 176 matching lines @@
   ASSERT_EQ(0, ask_allow_count_);
   ASSERT_EQ(0, continue_count_);
   ASSERT_EQ(1, cancel_count_);
   // And the state shouldn't have changed.
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(contents()));
 }
 
 TEST_F(DownloadRequestLimiterTest,
        DownloadRequestLimiter_RawWebContents) {
-  // By-pass TabContentsWrapperTestHarness and use
+  // By-pass TabContentsTestHarness and use
   // RenderViewHostTestHarness::CreateTestWebContents() directly so that there
   // will be no TabContentsWrapper for web_contents.
   scoped_ptr<WebContents> web_contents(CreateTestWebContents());
   TabContentsWrapper* tab_wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(web_contents.get());
   ASSERT_TRUE(tab_wrapper == NULL);
   // DRL won't try to make an infobar if it doesn't have a TCW, and we want to
   // test that it will Cancel() instead of prompting when it doesn't have a TCW,
   // so unset the delegate.
   UnsetDelegate();
@@ skipping 22 matching lines @@
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
   OnUserGestureFor(web_contents.get());
   EXPECT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
   CanDownloadFor(web_contents.get());
   EXPECT_EQ(3, continue_count_);
   EXPECT_EQ(1, cancel_count_);
   EXPECT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents.get()));
 }