Remove DownloadItem::Is*() in favor of DI::GetState()

content/browser/download/download_manager_impl_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 <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 97 matching lines @@
 
   MOCK_METHOD2(MockStart, void(DownloadFile*, DownloadRequestHandleInterface*));
 
   MOCK_METHOD0(Remove, void());
   MOCK_CONST_METHOD1(TimeRemaining, bool(base::TimeDelta*));
   MOCK_CONST_METHOD0(CurrentSpeed, int64());
   MOCK_CONST_METHOD0(PercentComplete, int());
   MOCK_CONST_METHOD0(AllDataSaved, bool());
   MOCK_CONST_METHOD1(MatchesQuery, bool(const string16& query));
   MOCK_CONST_METHOD0(IsDone, bool());
-  MOCK_CONST_METHOD0(IsInProgress, bool());
   MOCK_CONST_METHOD0(IsCancelled, bool());

[benjhayden, 2013/06/13 19:01:45]

Also remove IsCancelled, IsInterrupted, IsComplete?

   MOCK_CONST_METHOD0(IsInterrupted, bool());
   MOCK_CONST_METHOD0(IsComplete, bool());
   MOCK_CONST_METHOD0(GetFullPath, const base::FilePath&());
   MOCK_CONST_METHOD0(GetTargetFilePath, const base::FilePath&());
   MOCK_CONST_METHOD0(GetTargetDisposition, TargetDisposition());
   MOCK_METHOD1(OnContentCheckCompleted, void(DownloadDangerType));
   MOCK_CONST_METHOD0(GetState, DownloadState());
   MOCK_CONST_METHOD0(GetUrlChain, const std::vector<GURL>&());
   MOCK_METHOD1(SetTotalBytes, void(int64));
   MOCK_CONST_METHOD0(GetURL, const GURL&());
@@ skipping 470 matching lines @@
 
   download_manager_->StartDownload(info.Pass(), stream.Pass());
   EXPECT_TRUE(download_manager_->GetDownload(local_id));
 }
 
 // Confirm that calling DetermineDownloadTarget behaves properly if the delegate
 // blocks starting.
 TEST_F(DownloadManagerTest, DetermineDownloadTarget_True) {
   // Put a mock we have a handle to on the download manager.
   MockDownloadItemImpl& item(AddItemToManager());
-  EXPECT_CALL(item, IsInProgress())
-      .WillRepeatedly(Return(true));
+  EXPECT_CALL(item, GetState())
+      .WillRepeatedly(Return(DownloadItem::IN_PROGRESS));
 
   EXPECT_CALL(GetMockDownloadManagerDelegate(),
               DetermineDownloadTarget(&item, _))
       .WillOnce(Return(true));
   DetermineDownloadTarget(&item);
 }
 
 // Confirm that calling DetermineDownloadTarget behaves properly if the delegate
 // allows starting.  This also tests OnDownloadTargetDetermined.
 TEST_F(DownloadManagerTest, DetermineDownloadTarget_False) {
@@ skipping 18 matching lines @@
 }
 
 // Confirm the DownloadManagerImpl::RemoveAllDownloads() functionality
 TEST_F(DownloadManagerTest, RemoveAllDownloads) {
   base::Time now(base::Time::Now());
   for (int i = 0; i < 4; ++i) {
     MockDownloadItemImpl& item(AddItemToManager());
     EXPECT_EQ(i, item.GetId());
     EXPECT_CALL(item, GetStartTime())
         .WillRepeatedly(Return(now));
-
-    // Default returns; overridden for each item below.
-    EXPECT_CALL(GetMockDownloadItem(i), IsComplete())
-        .WillRepeatedly(Return(false));
-    EXPECT_CALL(GetMockDownloadItem(i), IsCancelled())
-        .WillRepeatedly(Return(false));
-    EXPECT_CALL(GetMockDownloadItem(i), IsInterrupted())
-        .WillRepeatedly(Return(false));
-    EXPECT_CALL(GetMockDownloadItem(i), IsInProgress())
-        .WillRepeatedly(Return(false));
   }
 
   // Specify states for each.
-  EXPECT_CALL(GetMockDownloadItem(0), IsComplete())
-      .WillRepeatedly(Return(true));
-  EXPECT_CALL(GetMockDownloadItem(1), IsCancelled())
-      .WillRepeatedly(Return(true));
-  EXPECT_CALL(GetMockDownloadItem(2), IsInterrupted())
-      .WillRepeatedly(Return(true));
-  EXPECT_CALL(GetMockDownloadItem(3), IsInProgress())
-      .WillRepeatedly(Return(true));
+  EXPECT_CALL(GetMockDownloadItem(0), GetState())
+      .WillRepeatedly(Return(DownloadItem::COMPLETE));
+  EXPECT_CALL(GetMockDownloadItem(1), GetState())
+      .WillRepeatedly(Return(DownloadItem::CANCELLED));
+  EXPECT_CALL(GetMockDownloadItem(2), GetState())
+      .WillRepeatedly(Return(DownloadItem::INTERRUPTED));
+  EXPECT_CALL(GetMockDownloadItem(3), GetState())
+      .WillRepeatedly(Return(DownloadItem::IN_PROGRESS));
 
   // Expectations for whether or not they'll actually be removed.
   EXPECT_CALL(GetMockDownloadItem(0), Remove())
       .WillOnce(Return());
   EXPECT_CALL(GetMockDownloadItem(1), Remove())
       .WillOnce(Return());
   EXPECT_CALL(GetMockDownloadItem(2), Remove())
       .WillOnce(Return());
   EXPECT_CALL(GetMockDownloadItem(3), Remove())
       .Times(0);
 
   download_manager_->RemoveAllDownloads();
   // Because we're mocking the download item, the Remove call doesn't
   // result in them being removed from the DownloadManager list.
 }
 
 }  // namespace content