MD Downloads: fix incognito markers

chrome/browser/ui/webui/md_downloads/downloads_list_tracker.cc

 // Copyright 2015 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/webui/md_downloads/downloads_list_tracker.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 217 matching lines @@
   base::string16 file_name =
       download_item->GetFileNameToReportUser().LossyDisplayName();
   file_name = base::i18n::GetDisplayStringInLTRDirectionality(file_name);
   file_value->SetString("file_name", file_name);
   file_value->SetString("url", download_item->GetURL().spec());
   file_value->SetInteger("total", static_cast<int>(
       download_item->GetTotalBytes()));
   file_value->SetBoolean("file_externally_removed",
                          download_item->GetFileExternallyRemoved());
   file_value->SetBoolean("resume", download_item->CanResume());
-
-  bool incognito = false;
-  auto* original_manager = GetOriginalNotifierManager();
-  if (original_manager) {
-    incognito =
-        original_manager->GetDownload(download_item->GetId()) == download_item;
-  }
-  file_value->SetBoolean("otr", incognito);
+  file_value->SetBoolean("otr", IsIncognito(*download_item));
 
   const char* danger_type = "";
   base::string16 last_reason_text;
   // -2 is invalid, -1 means indeterminate, and 0-100 are in-progress.
   int percent = -2;
   base::string16 progress_status_text;
   bool retry = false;
   const char* state = nullptr;
 
   switch (download_item->GetState()) {
@@ skipping 44 matching lines @@
   file_value->SetString("danger_type", danger_type);
   file_value->SetString("last_reason_text", last_reason_text);
   file_value->SetInteger("percent", percent);
   file_value->SetString("progress_status_text", progress_status_text);
   file_value->SetBoolean("retry", retry);
   file_value->SetString("state", state);
 
   return file_value.Pass();
 }
 
+bool DownloadsListTracker::IsIncognito(const DownloadItem& item) const {
+  return GetOriginalNotifierManager() && GetMainNotifierManager() &&
+      GetMainNotifierManager()->GetDownload(item.GetId()) == &item;
+}
+
 const DownloadItem* DownloadsListTracker::GetItemForTesting(size_t index)
     const {
   if (index >= sorted_visible_items_.size())
     return nullptr;
 
   SortedSet::iterator it = sorted_visible_items_.begin();
   std::advance(it, index);
   return *it;
 }
 
 bool DownloadsListTracker::ShouldShow(const DownloadItem& item) const {
   return !download_crx_util::IsExtensionDownload(item) &&
       !item.IsTemporary() &&
       !item.GetFileNameToReportUser().empty() &&
       !item.GetTargetFilePath().empty() &&
       DownloadItemModel(const_cast<DownloadItem*>(&item)).ShouldShowInShelf() &&
       DownloadQuery::MatchesQuery(search_terms_, item);
 }
 
 bool DownloadsListTracker::StartTimeComparator::operator() (
     const content::DownloadItem* a, const content::DownloadItem* b) const {
   return a->GetStartTime() > b->GetStartTime();
 }
 
 void DownloadsListTracker::Init() {
   Profile* profile = Profile::FromBrowserContext(
       GetMainNotifierManager()->GetBrowserContext());
   if (profile->IsOffTheRecord()) {
+    Profile* original_profile = profile->GetOriginalProfile();
     original_notifier_.reset(new AllDownloadItemNotifier(
-       BrowserContext::GetDownloadManager(profile->GetOriginalProfile()),
-        this));
+        BrowserContext::GetDownloadManager(original_profile), this));
   }
 
   RebuildSortedSet();
 }
 
 void DownloadsListTracker::RebuildSortedSet() {
   DownloadVector all_items, visible_items;
 
   GetMainNotifierManager()->GetAllDownloads(&all_items);
 
@@ skipping 34 matching lines @@
   return std::distance(sorted_visible_items_.begin(), position);
 }
 
 void DownloadsListTracker::RemoveItem(const SortedSet::iterator& remove) {
   if (sending_updates_) {
     web_ui_->CallJavascriptFunction("downloads.Manager.removeItem",
                                     base::FundamentalValue(GetIndex(remove)));
   }
   sorted_visible_items_.erase(remove);
 }