Allow keyboard shortcuts can be captured by webpage when toolbar is not visible

chrome/browser/ui/browser_command_controller_unittest.cc

 // Copyright (c) 2012 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/ui/browser_command_controller.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 234 matching lines @@
 
 //////////////////////////////////////////////////////////////////////////////
 class BrowserCommandControllerFullscreenTest;
 
 // A test browser window that can toggle fullscreen state.
 class FullscreenTestBrowserWindow : public TestBrowserWindow,
                                     ExclusiveAccessContext {
  public:
   FullscreenTestBrowserWindow(
       BrowserCommandControllerFullscreenTest* test_browser)
-      : fullscreen_(false), test_browser_(test_browser) {}
+      : fullscreen_(false),
+        toolbar_showing_(false),
+        test_browser_(test_browser) {}
 
   ~FullscreenTestBrowserWindow() override {}
 
   // TestBrowserWindow overrides:
   bool ShouldHideUIForFullscreen() const override { return fullscreen_; }
   bool IsFullscreen() const override { return fullscreen_; }
   void EnterFullscreen(const GURL& url,
                        ExclusiveAccessBubbleType type) override {
     fullscreen_ = true;
   }
   void ExitFullscreen() override { fullscreen_ = false; }
+  bool IsToolbarShowing() const override { return toolbar_showing_; }
 
   ExclusiveAccessContext* GetExclusiveAccessContext() override { return this; }
 
   // Exclusive access interface:
   Profile* GetProfile() override;
   content::WebContents* GetActiveWebContents() override;
   void HideDownloadShelf() override {}
   void UnhideDownloadShelf() override {}
   void UpdateExclusiveAccessExitBubbleContent(
       const GURL& url,
       ExclusiveAccessBubbleType bubble_type) override {}
   void OnExclusiveAccessUserInput() override {}
 
+  void set_toolbar_showing(bool showing) { toolbar_showing_ = showing; }
+
  private:
   bool fullscreen_;
+  bool toolbar_showing_;
   BrowserCommandControllerFullscreenTest* test_browser_;
 
   DISALLOW_COPY_AND_ASSIGN(FullscreenTestBrowserWindow);
 };
 
 // Test that uses FullscreenTestBrowserWindow for its window.
 class BrowserCommandControllerFullscreenTest
     : public BrowserWithTestWindowTest {
  public:
   BrowserCommandControllerFullscreenTest() {}
@@ skipping 13 matching lines @@
 Profile* FullscreenTestBrowserWindow::GetProfile() {
   return test_browser_->GetBrowser()->profile();
 }
 
 content::WebContents* FullscreenTestBrowserWindow::GetActiveWebContents() {
   return test_browser_->GetBrowser()->tab_strip_model()->GetActiveWebContents();
 }
 
 TEST_F(BrowserCommandControllerFullscreenTest,
        UpdateCommandsForFullscreenMode) {
+  const int commands_enabled_in_tab[] = {

[msw, 2017/04/05 23:55:11]

I have a slight preference for a struct with bool values for each of the
relevant expectations. That way we'd have a single array and all of its commands
are tested for each of the conditions. Otherwise, we're prone to some incomplete
testing (ie. we never check if IDC_OPEN_CURRENT_URL is reserved or not). Bonus
points for a nicely formatted table:

struct {
  int command_id;
  bool enabled_in_tab;
  bool reserved_in_tab;
  bool enabled_in_fullscreen;
  bool reserved_in_fullscreen;
} commands[] = {
    //       Command ID       |      in-tab       |     fullscreen    |
    //                        | enabled, reserved | enabled, reserved |
    { IDC_FAKE_COMMAND_1,       true,    false,     true,    false    },
    { IDC_FAKE_COMMAND_EXAMPLE, false,   true,      false,   true     },
};

[Hzj_jie, 2017/04/06 02:37:59]

Done.

+    IDC_OPEN_CURRENT_URL,

[msw, 2017/04/05 23:55:11]

nit: use a consistent indentation level for these arrays.

[Hzj_jie, 2017/04/06 02:37:58]

Weird, git cl format does not format all the lines.

+    IDC_FOCUS_TOOLBAR,
+    IDC_FOCUS_LOCATION,
+    IDC_FOCUS_SEARCH,
+    IDC_FOCUS_MENU_BAR,
+    IDC_FOCUS_NEXT_PANE,
+    IDC_FOCUS_PREVIOUS_PANE,
+    IDC_FOCUS_BOOKMARKS,
+    IDC_DEVELOPER_MENU,
+#if defined(GOOGLE_CHROME_BUILD)
+    IDC_FEEDBACK,
+#endif
+    IDC_OPTIONS,
+    IDC_IMPORT_SETTINGS,
+    IDC_EDIT_SEARCH_ENGINES,
+    IDC_VIEW_PASSWORDS,
+    IDC_ABOUT,
+    IDC_SHOW_APP_MENU,
+    IDC_FULLSCREEN,
+    IDC_CLOSE_TAB,
+    IDC_CLOSE_WINDOW,
+    IDC_NEW_INCOGNITO_WINDOW,
+    IDC_NEW_TAB,
+    IDC_NEW_WINDOW,
+    IDC_SELECT_NEXT_TAB,
+    IDC_SELECT_PREVIOUS_TAB,
+    IDC_EXIT,
+  };
+  const int commands_disabled_in_tab[] = {
+      IDC_SHOW_AS_TAB,
+  };
+  const int commands_enabled_in_fullscreen[] = {
+      IDC_FULLSCREEN,
+      IDC_CLOSE_TAB,
+      IDC_CLOSE_WINDOW,
+      IDC_NEW_INCOGNITO_WINDOW,
+      IDC_NEW_TAB,
+      IDC_NEW_WINDOW,
+      IDC_SELECT_NEXT_TAB,
+      IDC_SELECT_PREVIOUS_TAB,
+      IDC_EXIT,
+  };
+  // Most commands are disabled in fullscreen.
+  const int commands_disabled_in_fullscreen[] = {
+    IDC_OPEN_CURRENT_URL,
+    IDC_SHOW_AS_TAB,
+    IDC_FOCUS_TOOLBAR,
+    IDC_FOCUS_LOCATION,
+    IDC_FOCUS_SEARCH,
+    IDC_FOCUS_MENU_BAR,
+    IDC_FOCUS_NEXT_PANE,
+    IDC_FOCUS_PREVIOUS_PANE,
+    IDC_FOCUS_BOOKMARKS,
+    IDC_DEVELOPER_MENU,
+#if defined(GOOGLE_CHROME_BUILD)
+    IDC_FEEDBACK,
+#endif
+    IDC_OPTIONS,
+    IDC_IMPORT_SETTINGS,
+    IDC_EDIT_SEARCH_ENGINES,
+    IDC_VIEW_PASSWORDS,
+    IDC_ABOUT,
+    IDC_SHOW_APP_MENU,
+  };
+
+  // The command shortcuts which are reserved by browser.
+  const int commands_reserved_in_tab[] = {
+      IDC_CLOSE_TAB,
+      IDC_CLOSE_WINDOW,
+      IDC_NEW_INCOGNITO_WINDOW,
+      IDC_NEW_TAB,
+      IDC_NEW_WINDOW,
+      IDC_SELECT_NEXT_TAB,
+      IDC_SELECT_PREVIOUS_TAB,
+      IDC_EXIT,
+  };
+  const int commands_unreserved_in_tab[] = {
+      IDC_FULLSCREEN,
+  };
+  // In fullscreen, only the exit fullscreen commands are reserved. All other
+  // shortcuts should be delivered to the web page. See http://crbug.com/680809.
+  const int commands_reserved_in_fullscreen[] = {
+      IDC_EXIT, IDC_FULLSCREEN,
+  };
+  const int commands_unreserved_in_fullscreen[] = {
+      IDC_CLOSE_TAB,
+      IDC_CLOSE_WINDOW,
+      IDC_NEW_INCOGNITO_WINDOW,
+      IDC_NEW_TAB,
+      IDC_NEW_WINDOW,
+      IDC_SELECT_NEXT_TAB,
+      IDC_SELECT_PREVIOUS_TAB,
+  };
+  const content::NativeWebKeyboardEvent key_event(
+      blink::WebInputEvent::TypeFirst, 0, 0);
   // Defaults for a tabbed browser.
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_AS_TAB));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_TOOLBAR));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_LOCATION));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_SEARCH));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_MENU_BAR));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_NEXT_PANE));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_PREVIOUS_PANE));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_BOOKMARKS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU));
-#if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK));
-#endif
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ABOUT));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
+  for (size_t i = 0; i < arraysize(commands_enabled_in_tab); i++) {
+    EXPECT_TRUE(

[msw, 2017/04/05 23:55:11]

Have you checked the output for a failure in this test? My guess is that it's
not informative (ie. doesn't state the command id) It'd be nice to have some
SCOPED_TRACE statements to give the command id value (and maybe the array
index?).

[Hzj_jie, 2017/04/06 02:37:59]

Done.

+        chrome::IsCommandEnabled(browser(), commands_enabled_in_tab[i]));
+  }
+  for (size_t i = 0; i < arraysize(commands_disabled_in_tab); i++) {
+    EXPECT_FALSE(
+        chrome::IsCommandEnabled(browser(), commands_disabled_in_tab[i]));
+  }
+  for (size_t i = 0; i < arraysize(commands_reserved_in_tab); i++) {
+    EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
+        commands_reserved_in_tab[i], key_event));
+  }
+  for (size_t i = 0; i < arraysize(commands_unreserved_in_tab); i++) {
+    EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(
+        commands_unreserved_in_tab[i], key_event));
+  }
 
   // Simulate going fullscreen.
   chrome::ToggleFullscreenMode(browser());
   ASSERT_TRUE(browser()->window()->IsFullscreen());
   browser()->command_controller()->FullscreenStateChanged();
 
-  // Most commands are disabled in fullscreen.
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_AS_TAB));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_TOOLBAR));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_LOCATION));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_SEARCH));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_MENU_BAR));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_NEXT_PANE));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_PREVIOUS_PANE));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_BOOKMARKS));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU));
-#if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK));
+#if defined(OS_MACOSX)
+  // Once the toolbar is not showing, the behavior on Mac OS should be

[msw, 2017/04/05 23:55:10]

nit: 'When the'

[Hzj_jie, 2017/04/06 02:37:58]

Done.

+  // consistent as other platforms.

[msw, 2017/04/05 23:55:10]

nit: 'consistent with'

[Hzj_jie, 2017/04/06 02:37:58]

Done.

+  static_cast<FullscreenTestBrowserWindow*>(window())->set_toolbar_showing(
+      false);
 #endif
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_ABOUT));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
+  for (size_t i = 0; i < arraysize(commands_enabled_in_fullscreen); i++) {
+    EXPECT_TRUE(
+        chrome::IsCommandEnabled(browser(), commands_enabled_in_fullscreen[i]));
+  }
+  for (size_t i = 0; i < arraysize(commands_disabled_in_fullscreen); i++) {
+    EXPECT_FALSE(chrome::IsCommandEnabled(browser(),
+                                          commands_disabled_in_fullscreen[i]));
+  }
+  for (size_t i = 0; i < arraysize(commands_reserved_in_fullscreen); i++) {
+    EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
+        commands_reserved_in_fullscreen[i], key_event));
+  }
+  for (size_t i = 0; i < arraysize(commands_unreserved_in_fullscreen); i++) {
+    EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(
+        commands_unreserved_in_fullscreen[i], key_event));
+  }
 
+#if defined(OS_MACOSX)
+  // If the toolbar is visible, all the keyboard shortcuts should be preserved

[msw, 2017/04/05 23:55:11]

nit: "When the toolbar is showing, commands should be reserved as if the content
were in a tab; IDC_FULLSCREEN should also be reserved."

[Hzj_jie, 2017/04/06 02:37:59]

Done.

+  // by browser, include IDC_FULLSCREEN.
+  static_cast<FullscreenTestBrowserWindow*>(window())->set_toolbar_showing(
+      true);
+  for (size_t i = 0; i < arraysize(commands_reserved_in_tab); i++) {
+    EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
+        commands_reserved_in_tab[i], key_event));
+  }
   EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_CLOSE_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_CLOSE_WINDOW,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_NEW_INCOGNITO_WINDOW,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_NEW_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_NEW_WINDOW,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_SELECT_NEXT_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_SELECT_PREVIOUS_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_EXIT,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
+      IDC_FULLSCREEN, key_event));
+  for (size_t i = 0; i < arraysize(commands_unreserved_in_tab); i++) {
+    if (commands_unreserved_in_tab[i] != IDC_FULLSCREEN) {

[msw, 2017/04/05 23:55:11]

aside: This is a bit odd, since the only value in |commands_unreserved_in_tab|
is IDC_FULLSCREEN... But I guess that's future-proofing for other items to be
added to that array?

[Hzj_jie, 2017/04/06 02:37:59]

Now all commands are in one structure, we do not have this issue anymore.

+      EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(
+          commands_unreserved_in_tab[i], key_event));
+    }
+  }
+  // Return to default state.
+  static_cast<FullscreenTestBrowserWindow*>(window())->set_toolbar_showing(
+      false);
+#endif
 
   // Exit fullscreen.
   chrome::ToggleFullscreenMode(browser());
   ASSERT_FALSE(browser()->window()->IsFullscreen());
   browser()->command_controller()->FullscreenStateChanged();
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPEN_CURRENT_URL));
-  EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_SHOW_AS_TAB));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_TOOLBAR));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_LOCATION));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_SEARCH));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_MENU_BAR));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_NEXT_PANE));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_PREVIOUS_PANE));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FOCUS_BOOKMARKS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_DEVELOPER_MENU));
-#if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FEEDBACK));
-#endif
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_EDIT_SEARCH_ENGINES));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_VIEW_PASSWORDS));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_ABOUT));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_SHOW_APP_MENU));
-  EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_FULLSCREEN));
 
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_CLOSE_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_CLOSE_WINDOW,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_NEW_INCOGNITO_WINDOW,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_NEW_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_NEW_WINDOW,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_SELECT_NEXT_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_SELECT_PREVIOUS_TAB,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
-  EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
-      IDC_EXIT,
-      content::NativeWebKeyboardEvent(blink::WebInputEvent::TypeFirst, 0, 0)));
+  for (size_t i = 0; i < arraysize(commands_enabled_in_tab); i++) {
+    EXPECT_TRUE(
+        chrome::IsCommandEnabled(browser(), commands_enabled_in_tab[i]));
+  }
+  for (size_t i = 0; i < arraysize(commands_disabled_in_tab); i++) {
+    EXPECT_FALSE(
+        chrome::IsCommandEnabled(browser(), commands_disabled_in_tab[i]));
+  }
+  for (size_t i = 0; i < arraysize(commands_reserved_in_tab); i++) {
+    EXPECT_TRUE(browser()->command_controller()->IsReservedCommandOrKey(
+        commands_reserved_in_tab[i], key_event));
+  }
+  for (size_t i = 0; i < arraysize(commands_unreserved_in_tab); i++) {
+    EXPECT_FALSE(browser()->command_controller()->IsReservedCommandOrKey(
+        commands_unreserved_in_tab[i], key_event));
+  }
 
   // Guest Profiles disallow some options.
   TestingProfile* testprofile = browser()->profile()->AsTestingProfile();
   EXPECT_TRUE(testprofile);
   testprofile->SetGuestSession(true);
 
   browser()->command_controller()->FullscreenStateChanged();
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
   EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
 }
@@ skipping 48 matching lines @@
 
 TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) {
   chrome::BrowserCommandController command_controller(browser());
   const CommandUpdater* command_updater = command_controller.command_updater();
 
   // Check that the SYNC_SETUP command is updated on preference change.
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
   profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
 }