Resolve initialize/destory order between ArcService and ArcSessionManager.

chrome/browser/chromeos/login/session/user_session_manager.cc

 // Copyright 2014 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/chromeos/login/session/user_session_manager.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 13 matching lines @@
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/threading/worker_pool.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part_chromeos.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/arc/arc_session_manager.h"
+#include "chrome/browser/chromeos/arc/arc_service_launcher.h"
 #include "chrome/browser/chromeos/base/locale_util.h"
 #include "chrome/browser/chromeos/boot_times_recorder.h"
 #include "chrome/browser/chromeos/first_run/first_run.h"
 #include "chrome/browser/chromeos/first_run/goodies_displayer.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.h"
 #include "chrome/browser/chromeos/login/chrome_restart_request.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
@@ skipping 42 matching lines @@
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/cryptohome_util.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/login/auth/stub_authenticator.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "components/arc/arc_bridge_service.h"
-#include "components/arc/arc_service_manager.h"
 #include "components/component_updater/component_updater_service.h"
 #include "components/flags_ui/pref_service_flags_storage.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/quirks/quirks_manager.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/signin/core/browser/account_tracker_service.h"
@@ skipping 1032 matching lines @@
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
   if (user_manager->GetPrimaryUser() == user) {
     InitRlz(profile);
     InitializeCerts(profile);
     InitializeCRLSetFetcher(user);
     InitializeCertificateTransparencyComponents(user);
 
     if (arc::ArcBridgeService::GetEnabled(
             base::CommandLine::ForCurrentProcess())) {
-      const AccountId& account_id =
-          multi_user_util::GetAccountIdFromProfile(profile);
-      std::unique_ptr<BooleanPrefMember> arc_enabled_pref =
-          base::MakeUnique<BooleanPrefMember>();
-      arc_enabled_pref->Init(prefs::kArcEnabled, profile->GetPrefs());
-      DCHECK(arc::ArcServiceManager::Get());
-      arc::ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
-          account_id, std::move(arc_enabled_pref));
-      arc::ArcSessionManager* arc_session_manager =
-          arc::ArcSessionManager::Get();
-      DCHECK(arc_session_manager);
-      arc_session_manager->OnPrimaryUserProfilePrepared(profile);
+      arc::ArcServiceLauncher::Get()->OnPrimaryUserProfilePrepared(profile);
     }
   }
 
   UpdateEasyUnlockKeys(user_context_);
   user_context_.ClearSecrets();
   if (TokenHandlesEnabled()) {
     CreateTokenUtilIfMissing();
     if (token_handle_util_->ShouldObtainHandle(user->GetAccountId())) {
       if (!token_handle_fetcher_.get()) {
         token_handle_fetcher_.reset(new TokenHandleFetcher(
@@ skipping 662 matching lines @@
   bool show_names_on_signin = true;
   auto* cros_settings = CrosSettings::Get();
   cros_settings->GetBoolean(kAccountsPrefEphemeralUsersEnabled,
                             &ephemeral_users_enabled);
   cros_settings->GetBoolean(kAccountsPrefShowUserNamesOnSignIn,
                             &show_names_on_signin);
   return show_names_on_signin && !ephemeral_users_enabled;
 }
 
 void UserSessionManager::Shutdown() {
-  if (arc::ArcBridgeService::GetEnabled(

[hidehiko, 2016/11/25 06:44:30]

Note: this is just redundant.
UserSessionManager::Shutdown() is called only from:
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

However, beforehand, ArcServiceLauncher::Shutdown() is invoked:
https://cs.chromium.org/chromium/src/chrome/browser/chromeos/chrome_browser_m...

so ArcService instances are already destroyed here.
# Moreover, DCHECK should fail.

[xiyuan, 2016/11/28 22:33:28]

Acknowledged.

-          base::CommandLine::ForCurrentProcess())) {
-    DCHECK(arc::ArcServiceManager::Get());
-    arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
-    if (arc_session_manager)
-      arc_session_manager->Shutdown();
-  }
   token_handle_fetcher_.reset();
   token_handle_util_.reset();
   first_run::GoodiesDisplayer::Delete();
 }
 
 void UserSessionManager::CreateTokenUtilIfMissing() {
   if (!token_handle_util_.get())
     token_handle_util_.reset(new TokenHandleUtil());
 }
 
 bool UserSessionManager::ShouldShowEolNotification(Profile* profile) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           chromeos::switches::kDisableEolNotification)) {
     return false;
   }
 
   // Do not show end of life notification if this device is managed by
   // enterprise user.
   if (g_browser_process->platform_part()
           ->browser_policy_connector_chromeos()
           ->IsEnterpriseManaged()) {
     return false;
   }
 
   // Do not show end of life notification if this is a guest session
   return !profile->IsGuestSession();
 }
 
 }  // namespace chromeos