Remove HostDesktopType from FindLastActive[WithProfile]

chrome/browser/safe_browsing/srt_fetcher_win.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/safe_browsing/srt_fetcher_win.h"
 
 #include <stdint.h>
 
 #include <vector>
 
@@ skipping 78 matching lines @@
     "SoftwareReporter.FoundUwSReadError";
 const char kScanTimesMetricName[] = "SoftwareReporter.UwSScanTimes";
 const char kMemoryUsedMetricName[] = "SoftwareReporter.MemoryUsed";
 
 void DisplaySRTPrompt(const base::FilePath& download_path) {
   // Find the last active browser, which may be NULL, in which case we won't
   // show the prompt this time and will wait until the next run of the
   // reporter. We can't use other ways of finding a browser because we don't
   // have a profile.
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
-  Browser* browser = chrome::FindLastActiveWithHostDesktopType(desktop_type);
+  Browser* browser = chrome::FindLastActive();
   if (!browser)
     return;
 
   Profile* profile = browser->profile();
   DCHECK(profile);
 
   // Make sure we have a tabbed browser since we need to anchor the bubble to
   // the toolbar's wrench menu. Create one if none exist already.
   if (browser->type() != Browser::TYPE_TABBED) {
     browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
@@ skipping 409 matching lines @@
       RecordReporterStepHistogram(SW_REPORTER_NO_PROMPT_NEEDED);
       return;
     }
 
     // Find the last active browser, which may be NULL, in which case we need
     // to wait for one to be available. We can't use other ways of finding a
     // browser because we don't have a profile. And we need a browser to get to
     // a profile, which we need, to tell whether we should prompt or not.
     // TODO(mad): crbug.com/503269, investigate whether we should change how we
     // decide when it's time to download the SRT and when to display the prompt.
-    chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
-    Browser* browser = chrome::FindLastActiveWithHostDesktopType(desktop_type);
+    Browser* browser = chrome::FindLastActive();
     if (!browser) {
       RecordReporterStepHistogram(SW_REPORTER_NO_BROWSER);
       BrowserList::AddObserver(this);
     } else {
       MaybeFetchSRT(browser, version_);
     }
   }
 
   void TryToRun() {
     DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 90 matching lines @@
 
 void SetReporterLauncherForTesting(const ReporterLauncher& reporter_launcher) {
   g_reporter_launcher_ = reporter_launcher;
 }
 
 void SetPromptTriggerForTesting(const PromptTrigger& prompt_trigger) {
   g_prompt_trigger_ = prompt_trigger;
 }
 
 }  // namespace safe_browsing