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

chrome/browser/download/download_test_observer.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 <vector>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/task.h"
@@ skipping 65 matching lines @@
 bool DownloadTestObserver::IsFinished() const {
   if (finished_downloads_.size() - finished_downloads_at_construction_ >=
       wait_count_)
     return true;
   return (finish_on_select_file_ && select_file_dialog_seen_);
 }
 
 void DownloadTestObserver::OnDownloadUpdated(DownloadItem* download) {
   // The REMOVING state indicates that the download is being destroyed.
   // Stop observing.  Do not do anything with it, as it is about to be gone.
-  if (download->state() == DownloadItem::REMOVING) {
+  if (download->GetState() == DownloadItem::REMOVING) {
     DownloadSet::iterator it = downloads_observed_.find(download);
     ASSERT_TRUE(it != downloads_observed_.end());
     downloads_observed_.erase(it);
     download->RemoveObserver(this);
     return;
   }
 
   // Real UI code gets the user's response after returning from the observer.
-  if (download->safety_state() == DownloadItem::DANGEROUS &&
-      !ContainsKey(dangerous_downloads_seen_, download->id())) {
-    dangerous_downloads_seen_.insert(download->id());
+  if (download->GetSafetyState() == DownloadItem::DANGEROUS &&
+      !ContainsKey(dangerous_downloads_seen_, download->GetId())) {
+    dangerous_downloads_seen_.insert(download->GetId());
 
     // Calling DangerousDownloadValidated() at this point will
     // cause the download to be completed twice.  Do what the real UI
     // code does: make the call as a delayed task.
     switch (dangerous_download_action_) {
       case ON_DANGEROUS_DOWNLOAD_ACCEPT:
         // Fake user click on "Accept".  Delay the actual click, as the
         // real UI would.
         BrowserThread::PostTask(
             BrowserThread::UI, FROM_HERE,
             NewRunnableFunction(
                 &AcceptDangerousDownload,
                 download_manager_,
-                download->id()));
+                download->GetId()));
         break;
 
       case ON_DANGEROUS_DOWNLOAD_DENY:
         // Fake a user click on "Deny".  Delay the actual click, as the
         // real UI would.
         BrowserThread::PostTask(
             BrowserThread::UI, FROM_HERE,
             NewRunnableFunction(
                 &DenyDangerousDownload,
                 download_manager_,
-                download->id()));
+                download->GetId()));
         break;
 
       case ON_DANGEROUS_DOWNLOAD_FAIL:
         ADD_FAILURE() << "Unexpected dangerous download item.";
         break;
 
       default:
         NOTREACHED();
     }
   }
 
-  if (download->state() == download_finished_state_) {
+  if (download->GetState() == download_finished_state_) {
     DownloadInFinalState(download);
   }
 }
 
 void DownloadTestObserver::ModelChanged() {
   // Regenerate DownloadItem observers.  If there are any download items
   // in our final state, note them in |finished_downloads_|
   // (done by |OnDownloadUpdated()|).
   std::vector<DownloadItem*> downloads;
   download_manager_->GetAllDownloads(FilePath(), &downloads);
@@ skipping 61 matching lines @@
 }
 
 void DownloadTestFlushObserver::ModelChanged() {
   // Model has changed, so there may be more DownloadItems to observe.
   CheckDownloadsInProgress(true);
 }
 
 void DownloadTestFlushObserver::OnDownloadUpdated(DownloadItem* download) {
   // The REMOVING state indicates that the download is being destroyed.
   // Stop observing.  Do not do anything with it, as it is about to be gone.
-  if (download->state() == DownloadItem::REMOVING) {
+  if (download->GetState() == DownloadItem::REMOVING) {
     DownloadSet::iterator it = downloads_observed_.find(download);
     ASSERT_TRUE(it != downloads_observed_.end());
     downloads_observed_.erase(it);
     download->RemoveObserver(this);
     return;
   }
 
   // No change in DownloadItem set on manager.
   CheckDownloadsInProgress(false);
 }
@@ skipping 11 matching lines @@
 // action.  If requested, also observes all downloads while iterating.
 void DownloadTestFlushObserver::CheckDownloadsInProgress(
     bool observe_downloads) {
   if (waiting_for_zero_inprogress_) {
     int count = 0;
 
     std::vector<DownloadItem*> downloads;
     download_manager_->SearchDownloads(string16(), &downloads);
     for (std::vector<DownloadItem*>::iterator it = downloads.begin();
          it != downloads.end(); ++it) {
-      if ((*it)->state() == DownloadItem::IN_PROGRESS)
+      if ((*it)->GetState() == DownloadItem::IN_PROGRESS)
         count++;
       if (observe_downloads) {
         if (downloads_observed_.find(*it) == downloads_observed_.end()) {
           (*it)->AddObserver(this);
           downloads_observed_.insert(*it);
         }
         // Download items are forever, and we don't want to make
         // assumptions about future state transitions, so once we
         // start observing them, we don't stop until destruction.
       }
@@ skipping 31 matching lines @@
   if (--cycle) {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         NewRunnableMethod(this, &DownloadTestFlushObserver::PingFileThread,
                           cycle));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask());
   }
 }