Use DownloadItem::GetState() in chrome/

chrome/browser/ui/gtk/download/download_shelf_gtk.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 "chrome/browser/ui/gtk/download/download_shelf_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/download/download_item_model.h"
@@ skipping 188 matching lines @@
 }
 
 void DownloadShelfGtk::DoClose(CloseReason reason) {
   // When we are closing, we can vertically overlap the render view. Make sure
   // we are on top.
   gdk_window_raise(gtk_widget_get_window(shelf_.get()));
   slide_widget_->Close();
   browser_->UpdateDownloadShelfVisibility(false);
   int num_in_progress = 0;
   for (size_t i = 0; i < download_items_.size(); ++i) {
-    if (download_items_[i]->download()->IsInProgress())
+    if (download_items_[i]->download()->GetState() == DownloadItem::IN_PROGRESS)
       ++num_in_progress;
   }
   download_util::RecordShelfClose(
       download_items_.size(), num_in_progress, reason == AUTOMATIC);
   SetCloseOnMouseOut(false);
 }
 
 Browser* DownloadShelfGtk::browser() const {
   return browser_;
 }
 
 void DownloadShelfGtk::Closed() {
   // Don't remove completed downloads if the shelf is just being auto-hidden
   // rather than explicitly closed by the user.
   if (is_hidden())
     return;
   // When the close animation is complete, remove all completed downloads.
   size_t i = 0;
   while (i < download_items_.size()) {
     DownloadItem* download = download_items_[i]->download();
-    bool is_transfer_done = download->IsComplete() ||
-                            download->IsCancelled() ||
-                            download->IsInterrupted();
+    DownloadItem::DownloadState state = download->GetState();
+    bool is_transfer_done = state == DownloadItem::COMPLETE ||
+                            state == DownloadItem::CANCELLED ||
+                            state == DownloadItem::INTERRUPTED;
     if (is_transfer_done && !download->IsDangerous()) {
       RemoveDownloadItem(download_items_[i]);
     } else {
       // We set all remaining items as "opened", so that the shelf will auto-
       // close in the future without the user clicking on them.
       download->SetOpened(true);
       ++i;
     }
   }
 }
@@ skipping 154 matching lines @@
   base::MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(
           &DownloadShelfGtk::Close, weak_factory_.GetWeakPtr(), AUTOMATIC),
       base::TimeDelta::FromMilliseconds(kAutoCloseDelayMs));
 }
 
 void DownloadShelfGtk::MouseEnteredShelf() {
   weak_factory_.InvalidateWeakPtrs();
 }