Split DownloadItem into an ABC, an Impl, and a Mock.

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2011 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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 1490 matching lines @@
       wait_for_open_(wait_for_open) {
 }
 
 AutomationProviderDownloadUpdatedObserver::
     ~AutomationProviderDownloadUpdatedObserver() {}
 
 void AutomationProviderDownloadUpdatedObserver::OnDownloadUpdated(
     DownloadItem* download) {
   // If this observer is watching for open, only send the reply if the download
   // has been auto-opened.
-  if (wait_for_open_ && !download->auto_opened())
+  if (wait_for_open_ && !download->GetAutoOpened())
     return;
 
   download->RemoveObserver(this);
 
   if (provider_) {
     scoped_ptr<DictionaryValue> return_value(
         provider_->GetDictionaryFromDownloadItem(download));
     AutomationJSONReply(provider_, reply_message_.release()).SendSuccess(
         return_value.get());
   }
@@ skipping 59 matching lines @@
 
 AllDownloadsCompleteObserver::~AllDownloadsCompleteObserver() {}
 
 void AllDownloadsCompleteObserver::ModelChanged() {
   // The set of downloads in the download manager has changed.  If there are
   // any new downloads that are still in progress, add them to the pending list.
   std::vector<DownloadItem*> downloads;
   download_manager_->GetAllDownloads(FilePath(), &downloads);
   for (std::vector<DownloadItem*>::iterator it = downloads.begin();
        it != downloads.end(); ++it) {
-    if ((*it)->state() == DownloadItem::IN_PROGRESS &&
-        pre_download_ids_.find((*it)->id()) == pre_download_ids_.end()) {
+    if ((*it)->GetState() == DownloadItem::IN_PROGRESS &&
+        pre_download_ids_.find((*it)->GetId()) == pre_download_ids_.end()) {
       (*it)->AddObserver(this);
       pending_downloads_.insert(*it);
     }
   }
   ReplyIfNecessary();
 }
 
 void AllDownloadsCompleteObserver::OnDownloadUpdated(DownloadItem* download) {
   // If the current download's status has changed to a final state (not state
   // "in progress"), remove it from the pending list.
-  if (download->state() != DownloadItem::IN_PROGRESS) {
+  if (download->GetState() != DownloadItem::IN_PROGRESS) {
     download->RemoveObserver(this);
     pending_downloads_.erase(download);
     ReplyIfNecessary();
   }
 }
 
 void AllDownloadsCompleteObserver::ReplyIfNecessary() {
   if (!pending_downloads_.empty())
     return;
 
@@ skipping 1311 matching lines @@
       if (automation_) {
         AutomationJSONReply(automation_, reply_message_.release())
             .SendSuccess(NULL);
       }
       delete this;
     }
   } else {
     NOTREACHED();
   }
 }