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

content/browser/download/download_manager_impl_unittest.cc

Index: content/browser/download/download_manager_impl_unittest.cc
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc
index 9c50a989f09ae1698c02de2f5c5cc2b1bb2a0e54..3fd60c80f54ffa341b45519eecc87ce61c2cfac2 100644
--- a/content/browser/download/download_manager_impl_unittest.cc
+++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -115,7 +115,6 @@ class MockDownloadItemImpl : public DownloadItemImpl {
   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());
@@ -607,8 +606,8 @@ TEST_F(DownloadManagerTest, StartDownload) {
 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, _))
@@ -647,27 +646,17 @@ TEST_F(DownloadManagerTest, RemoveAllDownloads) {
     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())