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

content/browser/download/drag_download_file.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 "content/browser/download/drag_download_file.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 87 matching lines @@
     }
     DCHECK_EQ(net::OK, error);
     download_item_ = item;
     download_item_->AddObserver(this);
   }
 
   // DownloadItem::Observer:
   virtual void OnDownloadUpdated(DownloadItem* item) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK_EQ(download_item_, item);
-    if (download_item_->IsComplete() ||
-        download_item_->IsCancelled() ||
-        download_item_->IsInterrupted()) {
+    DownloadItem::DownloadState state = download_item_->GetState();
+    if (state == DownloadItem::COMPLETE ||
+        state == DownloadItem::CANCELLED ||
+        state == DownloadItem::INTERRUPTED) {
       if (!on_completed_.is_null()) {
         on_completed_loop_->PostTask(FROM_HERE, base::Bind(
-            on_completed_, download_item_->IsComplete()));
+            on_completed_, state == DownloadItem::COMPLETE));
         on_completed_.Reset();
       }
       download_item_->RemoveObserver(this);
       download_item_ = NULL;
     }
     // Ignore other states.
   }
 
   virtual void OnDownloadDestroyed(DownloadItem* item) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK_EQ(download_item_, item);
     if (!on_completed_.is_null()) {
+      const bool isComplete =

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

is_complete

+          download_item_->GetState() == DownloadItem::COMPLETE;
       on_completed_loop_->PostTask(FROM_HERE, base::Bind(
-          on_completed_, download_item_->IsComplete()));
+          on_completed_, isComplete));
       on_completed_.Reset();
     }
     download_item_->RemoveObserver(this);
     download_item_ = NULL;
   }
 
   base::MessageLoop* on_completed_loop_;
   OnCompleted on_completed_;
   GURL url_;
   Referrer referrer_;
@@ skipping 92 matching lines @@
 
 void DragDownloadFile::CheckThread() {
 #if defined(OS_WIN)
   DCHECK(drag_message_loop_ == base::MessageLoop::current());
 #else
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 #endif
 }
 
 }  // namespace content