Move command handling and updating off Browser and onto a helper object.

chrome/browser/browser_commands_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/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 
@@ skipping 13 matching lines @@
   GURL about_blank(chrome::kAboutBlankURL);
 
   // Create three tabs.
   AddTab(browser(), about_blank);
   AddTab(browser(), about_blank);
   AddTab(browser(), about_blank);
 
   // Select the second tab.
   browser()->ActivateTabAt(1, false);
 
+  CommandUpdater* updater = browser()->command_controller()->command_updater();
+
   // Navigate to the first tab using an accelerator.
-  browser()->ExecuteCommand(IDC_SELECT_TAB_0);
+  updater->ExecuteCommand(IDC_SELECT_TAB_0);
   ASSERT_EQ(0, browser()->active_index());
 
   // Navigate to the second tab using the next accelerators.
-  browser()->ExecuteCommand(IDC_SELECT_NEXT_TAB);
+  updater->ExecuteCommand(IDC_SELECT_NEXT_TAB);
   ASSERT_EQ(1, browser()->active_index());
 
   // Navigate back to the first tab using the previous accelerators.
-  browser()->ExecuteCommand(IDC_SELECT_PREVIOUS_TAB);
+  updater->ExecuteCommand(IDC_SELECT_PREVIOUS_TAB);
   ASSERT_EQ(0, browser()->active_index());
 
   // Navigate to the last tab using the select last accelerator.
-  browser()->ExecuteCommand(IDC_SELECT_LAST_TAB);
+  updater->ExecuteCommand(IDC_SELECT_LAST_TAB);
   ASSERT_EQ(2, browser()->active_index());
 }
 
 // Tests IDC_DUPLICATE_TAB.
 TEST_F(BrowserCommandsTest, DuplicateTab) {
   GURL url1("http://foo/1");
   GURL url2("http://foo/2");
   GURL url3("http://foo/3");
 
   // Navigate to the three urls, then go back.
   AddTab(browser(), url1);
   NavigateAndCommitActiveTab(url2);
   NavigateAndCommitActiveTab(url3);
 
   size_t initial_window_count = BrowserList::size();
 
   // Duplicate the tab.
-  browser()->ExecuteCommand(IDC_DUPLICATE_TAB);
+  chrome::ExecuteCommand(browser(), IDC_DUPLICATE_TAB);
 
   // The duplicated tab should not end up in a new window.
   size_t window_count = BrowserList::size();
   ASSERT_EQ(initial_window_count, window_count);
 
   // And we should have a newly duplicated tab.
   ASSERT_EQ(2, browser()->tab_count());
 
   // Verify the stack of urls.
   content::NavigationController& controller =
       browser()->GetWebContentsAt(1)->GetController();
   ASSERT_EQ(3, controller.GetEntryCount());
   ASSERT_EQ(2, controller.GetCurrentEntryIndex());
   ASSERT_TRUE(url1 == controller.GetEntryAtIndex(0)->GetURL());
   ASSERT_TRUE(url2 == controller.GetEntryAtIndex(1)->GetURL());
   ASSERT_TRUE(url3 == controller.GetEntryAtIndex(2)->GetURL());
 }
 
 TEST_F(BrowserCommandsTest, BookmarkCurrentPage) {
   // We use profile() here, since it's a TestingProfile.
   profile()->CreateBookmarkModel(true);
   profile()->BlockUntilBookmarkModelLoaded();
 
   // Navigate to a url.
   GURL url1("http://foo/1");
   AddTab(browser(), url1);
   browser()->OpenURL(OpenURLParams(
       url1, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
 
-  // TODO(beng): remove this once we can use TabContentses directly in testing
-  //             instead of the TestTabContents which causes this command not to
-  //             be enabled when the tab is added (and selected).
-  browser()->command_updater()->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, true);
-
-  // Star it.
-  browser()->ExecuteCommand(IDC_BOOKMARK_PAGE);
+  chrome::BookmarkCurrentPage(browser());
 
   // It should now be bookmarked in the bookmark model.
   EXPECT_EQ(profile(), browser()->profile());
   EXPECT_TRUE(browser()->profile()->GetBookmarkModel()->IsBookmarked(url1));
 }
 
 // Tests back/forward in new tab (Control + Back/Forward button in the UI).
 TEST_F(BrowserCommandsTest, BackForwardInNewTab) {
   GURL url1("http://foo/1");
   GURL url2("http://foo/2");
@@ skipping 52 matching lines @@
   ASSERT_EQ(url1, browser()->GetActiveWebContents()->GetURL());
 
   // Same thing again for forward.
   // TODO(brettw) bug 11055: see the comment above about why we need this.
   CommitPendingLoad(&browser()->GetActiveWebContents()->GetController());
   chrome::GoForward(browser(), NEW_FOREGROUND_TAB);
   ASSERT_EQ(4, browser()->active_index());
   ASSERT_EQ(url2, browser()->GetActiveWebContents()->GetURL());
 }