Update BrowserCommandController and tests for ephemeral Guest profiles.

A few commands are updated in browser command controller for ephemeral
Guest profiles and the tests are updated to cover both old (OTR) Guest
profiles and the new ephemeral ones.

Please see go/ephemeral-guest-profiles for more context.

Bug: 1125474
Change-Id: Ifa4890dab8d971aada471fca0a03861ca14c5e90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2517588Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Ramin Halavati <rhalavati@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824318}

chrome/browser/ui/browser_command_controller.cc

@@ -1094,11 +1094,13 @@ void BrowserCommandController::UpdateSharedCommandsForIncognitoAvailability(
           !profile->IsGuestSession() && !profile->IsEphemeralGuestProfile());
 
   const bool forced_incognito =
-      incognito_availability == IncognitoModePrefs::FORCED ||
-      profile->IsGuestSession();  // Guest always runs in Incognito mode.
+      incognito_availability == IncognitoModePrefs::FORCED;
+  const bool is_guest =
+      profile->IsGuestSession() || profile->IsEphemeralGuestProfile();
+
   command_updater->UpdateCommandEnabled(
       IDC_SHOW_BOOKMARK_MANAGER,
-      browser_defaults::bookmarks_enabled && !forced_incognito);
+      browser_defaults::bookmarks_enabled && !forced_incognito && !is_guest);
   extensions::ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile)->extension_service();
   const bool enable_extensions =
@@ -1108,13 +1110,16 @@ void BrowserCommandController::UpdateSharedCommandsForIncognitoAvailability(
 
   // Bookmark manager and settings page/subpages are forced to open in normal
   // mode. For this reason we disable these commands when incognito is forced.
-  command_updater->UpdateCommandEnabled(IDC_MANAGE_EXTENSIONS,
-                                        enable_extensions && !forced_incognito);
-
-  command_updater->UpdateCommandEnabled(IDC_IMPORT_SETTINGS, !forced_incognito);
   command_updater->UpdateCommandEnabled(
-      IDC_OPTIONS, !forced_incognito || profile->IsGuestSession());
-  command_updater->UpdateCommandEnabled(IDC_SHOW_SIGNIN, !forced_incognito);
+      IDC_MANAGE_EXTENSIONS,
+      enable_extensions && !forced_incognito && !is_guest);
+
+  command_updater->UpdateCommandEnabled(IDC_IMPORT_SETTINGS,
+                                        !forced_incognito && !is_guest);
+  command_updater->UpdateCommandEnabled(IDC_OPTIONS,
+                                        !forced_incognito || is_guest);
+  command_updater->UpdateCommandEnabled(IDC_SHOW_SIGNIN,
+                                        !forced_incognito && !is_guest);
 }
 
 void BrowserCommandController::UpdateCommandsForIncognitoAvailability() {

chrome/browser/ui/browser_command_controller_browsertest.cc

@@ -25,6 +25,7 @@
 #include "chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/sessions/core/tab_restore_service.h"
@@ -84,10 +85,22 @@ IN_PROC_BROWSER_TEST_F(BrowserCommandControllerBrowserTest, DisableFind) {
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FIND));
 }
 
-// TODO(https://crbug.com/1125474): Expand to cover ChromeOS and ephemeral Guest
-// profiles.
+// TODO(https://crbug.com/1125474): Expand to cover ChromeOS.
 #if !defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(BrowserCommandControllerBrowserTest,
+class GuestBrowserCommandControllerBrowserTest
+    : public BrowserCommandControllerBrowserTest,
+      public testing::WithParamInterface<bool> {
+ public:
+  GuestBrowserCommandControllerBrowserTest() {
+    TestingProfile::SetScopedFeatureListForEphemeralGuestProfiles(
+        scoped_feature_list_, GetParam());
+  }
+
+ private:
+  base::test::ScopedFeatureList scoped_feature_list_;
+};
+
+IN_PROC_BROWSER_TEST_P(GuestBrowserCommandControllerBrowserTest,
                        NewAvatarMenuEnabledInGuestMode) {
   EXPECT_EQ(1U, BrowserList::GetInstance()->size());
 
@@ -97,6 +110,10 @@ IN_PROC_BROWSER_TEST_F(BrowserCommandControllerBrowserTest,
   const CommandUpdater* command_updater = browser->command_controller();
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 }
+
+INSTANTIATE_TEST_SUITE_P(AllGuestTypes,
+                         GuestBrowserCommandControllerBrowserTest,
+                         /*is_ephemeral=*/testing::Bool());
 #endif
 
 #if defined(OS_CHROMEOS)

chrome/browser/ui/browser_command_controller_unittest.cc

@@ -33,6 +33,24 @@
 
 typedef BrowserWithTestWindowTest BrowserCommandControllerTest;
 
+class GuestBrowserCommandControllerTest
+    : public BrowserWithTestWindowTest,
+      public testing::WithParamInterface<bool> {
+ public:
+  GuestBrowserCommandControllerTest() : is_ephemeral_(GetParam()) {
+    // Change the value if Ephemeral is not supported.
+    is_ephemeral_ &=
+        TestingProfile::SetScopedFeatureListForEphemeralGuestProfiles(
+            scoped_feature_list_, is_ephemeral_);
+  }
+
+  bool is_ephemeral() const { return is_ephemeral_; }
+
+ private:
+  bool is_ephemeral_;
+  base::test::ScopedFeatureList scoped_feature_list_;
+};
+
 TEST_F(BrowserCommandControllerTest, IsReservedCommandOrKey) {
 #if defined(OS_CHROMEOS)
   // F1-3 keys are reserved Chrome accelerators on Chrome OS.
@@ -157,7 +175,7 @@ TEST_F(BrowserCommandControllerTest, IsReservedCommandOrKeyIsApp) {
 #endif  // USE_AURA
 }
 
-TEST_F(BrowserCommandControllerTest, IncognitoCommands) {
+TEST_P(GuestBrowserCommandControllerTest, IncognitoCommands) {
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SHOW_SIGNIN));
@@ -300,10 +318,14 @@ class FullscreenTestBrowserWindow : public TestBrowserWindow,
 
 // Test that uses FullscreenTestBrowserWindow for its window.
 class BrowserCommandControllerFullscreenTest
-    : public BrowserWithTestWindowTest {
+    : public BrowserWithTestWindowTest,
+      public testing::WithParamInterface<bool> {
  public:
-  BrowserCommandControllerFullscreenTest() {}
-  ~BrowserCommandControllerFullscreenTest() override {}
+  BrowserCommandControllerFullscreenTest() {
+    TestingProfile::SetScopedFeatureListForEphemeralGuestProfiles(
+        scoped_feature_list_, GetParam());
+  }
+  ~BrowserCommandControllerFullscreenTest() override = default;
 
   Browser* GetBrowser() { return BrowserWithTestWindowTest::browser(); }
 
@@ -313,6 +335,7 @@ class BrowserCommandControllerFullscreenTest
   }
 
  private:
+  base::test::ScopedFeatureList scoped_feature_list_;
   DISALLOW_COPY_AND_ASSIGN(BrowserCommandControllerFullscreenTest);
 };
 
@@ -324,7 +347,7 @@ content::WebContents* FullscreenTestBrowserWindow::GetActiveWebContents() {
   return test_browser_->GetBrowser()->tab_strip_model()->GetActiveWebContents();
 }
 
-TEST_F(BrowserCommandControllerFullscreenTest,
+TEST_P(BrowserCommandControllerFullscreenTest,
        UpdateCommandsForFullscreenMode) {
   struct {
     int command_id;
@@ -453,10 +476,14 @@ TEST_F(BrowserCommandControllerFullscreenTest,
   EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
 }
 
+INSTANTIATE_TEST_SUITE_P(AllGuestTypes,
+                         BrowserCommandControllerFullscreenTest,
+                         /*is_ephemeral=*/testing::Bool());
+
 // Ensure that the logic for enabling IDC_OPTIONS is consistent, regardless of
 // the order of entering fullscreen and forced incognito modes. See
 // http://crbug.com/694331.
-TEST_F(BrowserCommandControllerTest, OptionsConsistency) {
+TEST_P(GuestBrowserCommandControllerTest, OptionsConsistency) {
   TestingProfile* profile = browser()->profile()->AsTestingProfile();
   // Setup guest session.
   profile->SetGuestSession(true);
@@ -509,3 +536,7 @@ TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) {
   profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SIGNIN));
 }
+
+INSTANTIATE_TEST_SUITE_P(AllGuestTypes,
+                         GuestBrowserCommandControllerTest,
+                         /*is_ephemeral=*/testing::Bool());