Kill DownloadItem::IsOtr()

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2688 matching lines @@
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   ListValue* list_of_downloads = new ListValue;
 
   DownloadService* download_service(
       DownloadServiceFactory::GetForProfile(browser->profile()));
 
   if (download_service->HasCreatedDownloadManager()) {
     std::vector<DownloadItem*> downloads;
     BrowserContext::GetDownloadManager(browser->profile())->
         GetAllDownloads(FilePath(), &downloads);
+    bool incognito = browser->profile()->HasOffTheRecordProfile() &&
+      (browser->profile() == browser->profile()->GetOffTheRecordProfile());
 
     for (std::vector<DownloadItem*>::iterator it = downloads.begin();
          it != downloads.end();
          it++) {  // Fill info about each download item.
-      list_of_downloads->Append(GetDictionaryFromDownloadItem(*it));
+      list_of_downloads->Append(GetDictionaryFromDownloadItem(*it, incognito));
     }
   }
   return_value->Set("downloads", list_of_downloads);
   reply.SendSuccess(return_value.get());
 }
 
 void TestingAutomationProvider::WaitForAllDownloadsToComplete(
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
@@ skipping 71 matching lines @@
     return;
   }
 
   // We need to be IN_PROGRESS for these actions.
   if ((action == "toggle_pause" || action == "cancel") &&
       !selected_item->IsInProgress()) {
     AutomationJSONReply(this, reply_message)
         .SendError("Selected DownloadItem is not in progress.");
   }
 
+  bool incognito = browser->profile()->HasOffTheRecordProfile() &&
+    (browser->profile() == browser->profile()->GetOffTheRecordProfile());
   if (action == "open") {
     selected_item->AddObserver(
         new AutomationProviderDownloadUpdatedObserver(
-            this, reply_message, true));
+            this, reply_message, true, incognito));
     selected_item->OpenDownload();
   } else if (action == "toggle_open_files_like_this") {
     DownloadPrefs* prefs =
         DownloadPrefs::FromBrowserContext(selected_item->GetBrowserContext());
     FilePath path = selected_item->GetUserVerifiedFilePath();
     if (!selected_item->ShouldOpenFileBasedOnExtension())
       prefs->EnableAutoOpenBasedOnExtension(path);
     else
       prefs->DisableAutoOpenBasedOnExtension(path);
     AutomationJSONReply(this, reply_message).SendSuccess(NULL);
   } else if (action == "remove") {
     download_manager->AddObserver(
         new AutomationProviderDownloadModelChangedObserver(
             this, reply_message, download_manager));
     selected_item->Remove();
   } else if (action == "decline_dangerous_download") {
     download_manager->AddObserver(
         new AutomationProviderDownloadModelChangedObserver(
             this, reply_message, download_manager));
     selected_item->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
   } else if (action == "save_dangerous_download") {
     selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
-        this, reply_message, false));
+        this, reply_message, false, incognito));
     selected_item->DangerousDownloadValidated();
   } else if (action == "toggle_pause") {
     selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
-        this, reply_message, false));
+        this, reply_message, false, incognito));
     // This will still return if download has already completed.
     selected_item->TogglePause();
   } else if (action == "cancel") {
     selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
-        this, reply_message, false));
+        this, reply_message, false, incognito));
     selected_item->Cancel(true);
   } else {
     AutomationJSONReply(this, reply_message)
         .SendError(StringPrintf("Invalid action '%s' given.", action.c_str()));
   }
 }
 
 // Sample JSON input { "command": "LoadSearchEngineInfo" }
 void TestingAutomationProvider::LoadSearchEngineInfo(
     Browser* browser,
@@ skipping 4053 matching lines @@
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   if (chrome::GetActiveWebContents(browser) != tab)
     chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true);
 }