Chrome OS: move DiscoverManager ownership to ChromeBrowserMainPartsChromeos.

TBR=sky@chromium.org

Bug: 828999
Change-Id: I46514f21581ab6d30e1c4b38719b66e43b075f42
Reviewed-on: https://chromium-review.googlesource.com/c/1278129Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Alexander Alekseev <alemate@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599146}

chrome/browser/browser_process_platform_part_chromeos.cc

@@ -27,7 +27,6 @@
 #include "chrome/browser/chromeos/system/timezone_util.h"
 #include "chrome/browser/component_updater/cros_component_installer_chromeos.h"
 #include "chrome/browser/component_updater/metadata_table_chromeos.h"
-#include "chrome/browser/ui/webui/chromeos/login/discover/discover_manager.h"
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/account_manager/account_manager_factory.h"
@@ -176,13 +175,6 @@ chromeos::TimeZoneResolver* BrowserProcessPlatformPart::GetTimezoneResolver() {
   return timezone_resolver_.get();
 }
 
-chromeos::DiscoverManager* BrowserProcessPlatformPart::GetDiscoverManager() {
-  if (!discover_manager_.get())
-    discover_manager_ = std::make_unique<chromeos::DiscoverManager>();
-
-  return discover_manager_.get();
-}
-
 void BrowserProcessPlatformPart::StartTearDown() {
   // interactive_ui_tests check for memory leaks before this object is
   // destroyed.  So we need to destroy |timezone_resolver_| here.

chrome/browser/browser_process_platform_part_chromeos.h

@@ -19,7 +19,6 @@ namespace chromeos {
 class AccountManagerFactory;
 class ChromeSessionManager;
 class ChromeUserManager;
-class DiscoverManager;
 class ProfileHelper;
 class TimeZoneResolver;
 
@@ -105,8 +104,6 @@ class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
 
   chromeos::TimeZoneResolver* GetTimezoneResolver();
 
-  chromeos::DiscoverManager* GetDiscoverManager();
-
   // Overridden from BrowserProcessPlatformPartBase:
   void StartTearDown() override;
   std::unique_ptr<policy::ChromeBrowserPolicyConnector>
@@ -163,8 +160,6 @@ class BrowserProcessPlatformPart : public BrowserProcessPlatformPartBase {
       input_device_controller_client_;
 #endif
 
-  std::unique_ptr<chromeos::DiscoverManager> discover_manager_;
-
   SEQUENCE_CHECKER(sequence_checker_);
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessPlatformPart);

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

@@ -107,6 +107,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_manager/task_manager_interface.h"
 #include "chrome/browser/ui/ash/chrome_keyboard_controller_client.h"
+#include "chrome/browser/ui/webui/chromeos/login/discover/discover_manager.h"
 #include "chrome/browser/upgrade_detector/upgrade_detector_chromeos.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
@@ -661,6 +662,8 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
   chromeos::ResourceReporter::GetInstance()->StartMonitoring(
       task_manager::TaskManagerInterface::GetTaskManager());
 
+  discover_manager_ = std::make_unique<DiscoverManager>();
+
   ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
 }
 

chrome/browser/chromeos/chrome_browser_main_chromeos.h

@@ -35,6 +35,7 @@ namespace chromeos {
 
 class ArcKioskAppManager;
 class DemoModeResourcesRemover;
+class DiscoverManager;
 class EventRewriterDelegateImpl;
 class IdleActionWarningObserver;
 class LowDiskNotification;
@@ -143,6 +144,7 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
 
   std::unique_ptr<DemoModeResourcesRemover> demo_mode_resources_remover_;
   std::unique_ptr<crostini::CrosvmMetrics> crosvm_metrics_;
+  std::unique_ptr<DiscoverManager> discover_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
 };

chrome/browser/ui/webui/chromeos/login/discover/discover_manager.cc

@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/webui/chromeos/login/discover/discover_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_launch_help_app.h"
 #include "chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_pin_setup.h"
@@ -16,16 +15,28 @@
 #include "chrome/browser/ui/webui/chromeos/login/discover/modules/discover_module_welcome.h"
 
 namespace chromeos {
+namespace {
+
+// Owned by ChromeBrowserMainPartsChromeos.
+DiscoverManager* g_discover_manager = nullptr;
+
+}  // namespace
 
 DiscoverManager::DiscoverManager() {
+  DCHECK(!g_discover_manager);
+  g_discover_manager = this;
+
   CreateModules();
 }
 
-DiscoverManager::~DiscoverManager() = default;
+DiscoverManager::~DiscoverManager() {
+  DCHECK_EQ(g_discover_manager, this);
+  g_discover_manager = nullptr;
+}
 
 // static
 DiscoverManager* DiscoverManager::Get() {
-  return g_browser_process->platform_part()->GetDiscoverManager();
+  return g_discover_manager;
 }
 
 bool DiscoverManager::IsCompleted() const {