• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
2index aaf861970f122..1c9648d3cc917 100644
3--- chrome/browser/browser_process.h
4+++ chrome/browser/browser_process.h
5@@ -201,9 +201,9 @@ class BrowserProcess {
6   virtual DownloadStatusUpdater* download_status_updater() = 0;
7   virtual DownloadRequestLimiter* download_request_limiter() = 0;
8
9+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
10   // Returns the object that manages background applications.
11   virtual BackgroundModeManager* background_mode_manager() = 0;
12-#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
13   virtual void set_background_mode_manager_for_test(
14       std::unique_ptr<BackgroundModeManager> manager) = 0;
15 #endif
16diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
17index cd8c5f9ee5835..bae8231637ab2 100644
18--- chrome/browser/browser_process_impl.cc
19+++ chrome/browser/browser_process_impl.cc
20@@ -995,18 +995,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
21   return download_request_limiter_.get();
22 }
23
24-BackgroundModeManager* BrowserProcessImpl::background_mode_manager() {
25 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
26+BackgroundModeManager* BrowserProcessImpl::background_mode_manager() {
27   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
28   if (!background_mode_manager_)
29     CreateBackgroundModeManager();
30   return background_mode_manager_.get();
31-#else
32-  return nullptr;
33-#endif
34 }
35
36-#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
37 void BrowserProcessImpl::set_background_mode_manager_for_test(
38     std::unique_ptr<BackgroundModeManager> manager) {
39   background_mode_manager_ = std::move(manager);
40diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
41index e61312aa24305..bc4333a3b87a8 100644
42--- chrome/browser/browser_process_impl.h
43+++ chrome/browser/browser_process_impl.h
44@@ -183,8 +183,8 @@ class BrowserProcessImpl : public BrowserProcess,
45   void SetApplicationLocale(const std::string& actual_locale) override;
46   DownloadStatusUpdater* download_status_updater() override;
47   DownloadRequestLimiter* download_request_limiter() override;
48-  BackgroundModeManager* background_mode_manager() override;
49 #if BUILDFLAG(ENABLE_BACKGROUND_MODE)
50+  BackgroundModeManager* background_mode_manager() override;
51   void set_background_mode_manager_for_test(
52       std::unique_ptr<BackgroundModeManager> manager) override;
53 #endif
54diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc
55index 7bc92543cf2bd..ae150df4ada12 100644
56--- chrome/browser/lifetime/browser_close_manager.cc
57+++ chrome/browser/lifetime/browser_close_manager.cc
58@@ -151,12 +151,14 @@ void BrowserCloseManager::CloseBrowsers() {
59   // exit can restore all browsers open before exiting.
60   ProfileManager::ShutdownSessionServices();
61 #endif
62+#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
63   if (!browser_shutdown::IsTryingToQuit()) {
64     BackgroundModeManager* background_mode_manager =
65         g_browser_process->background_mode_manager();
66     if (background_mode_manager)
67       background_mode_manager->SuspendBackgroundMode();
68   }
69+#endif
70
71   // Make a copy of the BrowserList to simplify the case where we need to
72   // destroy a Browser during the loop.
73