Mustash: Ignore --mash flag when comparing flags in UserSessionManager.

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 59 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h"
 #include "chrome/browser/supervised_user/child_accounts/child_account_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/cert_loader.h"
 #include "chromeos/chromeos_switches.h"
 #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"
@@ skipping 10 matching lines @@
 #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"
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/user_manager/known_user.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_names.h"
 #include "components/user_manager/user_type.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/features/feature_session_type.h"
 #include "net/cert/sth_distributor.h"
 #include "rlz/features/features.h"
 #include "ui/base/ime/chromeos/input_method_descriptor.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "url/gurl.h"
@@ skipping 163 matching lines @@
   // Only restart if needed and if not going into managed mode.
   if (user_manager::UserManager::Get()->IsLoggedInAsSupervisedUser())
     return false;
 
   if (about_flags::AreSwitchesIdenticalToCurrentCommandLine(
           user_flags, *base::CommandLine::ForCurrentProcess(),
           out_command_line_difference)) {
     return false;
   }
 
+#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+  // TODO(mfomitchev): When running Mustash, the flags stored in Profile Prefs
+  // will contain --mash, while the browser command line will not (and should
+  // not) have it. Also, the restart functionality doesn't currently work in
+  // Mustash. So if we detect that we are running Mustash - just return false.
+  // crbug.com/644350
+  version_info::Channel channel = chrome::GetChannel();

[James Cook, 2017/02/07 21:07:32]

Is there any particular reason to do the channel check?

[mfomitchev, 2017/02/07 21:42:59]

Just being extra careful to not affect anything in prod. This is what we do in
chrome_main as well, so I thought it made sense to be consistent:
https://cs.chromium.org/chromium/src/chrome/app/chrome_main.cc?l=104

+  if (channel == version_info::Channel::CANARY ||
+      channel == version_info::Channel::UNKNOWN) {
+    if (out_command_line_difference->find("--mash") !=
+        out_command_line_difference->end())

[James Cook, 2017/02/07 21:07:31]

nit: not strictly needed for style guide, but I would put {} here

[mfomitchev, 2017/02/07 21:42:59]

I changed the code - let me know if you still want the braces.

+      return false;
+  }
+#endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
+
   return true;
 }
 
 bool CanPerformEarlyRestart() {
   if (!ChromeUserManager::Get()
            ->GetCurrentUserFlow()
            ->SupportsEarlyRestartToApplyFlags()) {
     return false;
   }
 
@@ skipping 1583 matching lines @@
           ->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