diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 21:47:55 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-09 21:47:55 +0000 |
| commit | 712d82e5ef99e15dfc7a5f9ef2c5df8ea3c78dda (patch) | |
| tree | 13cb5b34f5ecfc9551b28d29614eae13a42ab1fe /chrome | |
| parent | 3683cbb58a3e46cc3bb3860268e7bcf6ca499a0b (diff) | |
| download | chromium_src-712d82e5ef99e15dfc7a5f9ef2c5df8ea3c78dda.zip chromium_src-712d82e5ef99e15dfc7a5f9ef2c5df8ea3c78dda.tar.gz chromium_src-712d82e5ef99e15dfc7a5f9ef2c5df8ea3c78dda.tar.bz2 | |
Cleanup small mistakes from my previous changelists.
Fix GoButtonGtkTest.ChangeModeStop test to call what it's actually supposed to test.
Replace tabs with spaces in chrome.gyp. Also delete a double entry I added earlier.
Review URL: http://codereview.chromium.org/62190
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13465 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/go_button_gtk_unittest.cc | 6 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 13 |
2 files changed, 9 insertions, 10 deletions
diff --git a/chrome/browser/gtk/go_button_gtk_unittest.cc b/chrome/browser/gtk/go_button_gtk_unittest.cc index 723f587..e6158cd 100644 --- a/chrome/browser/gtk/go_button_gtk_unittest.cc +++ b/chrome/browser/gtk/go_button_gtk_unittest.cc @@ -56,9 +56,9 @@ TEST_F(GoButtonGtkTest, ChangeModeGo) { } TEST_F(GoButtonGtkTest, ChangeModeStop) { - go_.ChangeMode(GoButtonGtk::MODE_GO); - EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.intended_mode()); - EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.visible_mode()); + go_.ChangeMode(GoButtonGtk::MODE_STOP); + EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.intended_mode()); + EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.visible_mode()); } TEST_F(GoButtonGtkTest, ScheduleChangeModeNormalGo) { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 92dc21a..86611c3 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -705,7 +705,7 @@ 'browser/gtk/download_item_gtk.h', 'browser/gtk/download_shelf_gtk.cc', 'browser/gtk/download_shelf_gtk.h', - 'browser/gtk/go_button_gtk.cc', + 'browser/gtk/go_button_gtk.cc', 'browser/gtk/go_button_gtk.h', 'browser/gtk/gtk_chrome_button.cc', 'browser/gtk/gtk_chrome_button.h', @@ -2113,8 +2113,8 @@ 'browser/extensions/test_extension_loader.cc', 'browser/extensions/user_script_master_unittest.cc', 'browser/google_url_tracker_unittest.cc', - 'browser/gtk/go_button_gtk_unittest.cc', - 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', + 'browser/gtk/go_button_gtk_unittest.cc', + 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', 'browser/history/expire_history_backend_unittest.cc', 'browser/history/history_backend_unittest.cc', 'browser/history/history_querying_unittest.cc', @@ -2254,7 +2254,7 @@ 'browser/back_forward_menu_model_unittest.cc', 'browser/download/download_manager_unittest.cc', 'browser/gtk/go_button_gtk_unittest.cc', - 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', + 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', 'browser/navigation_controller_unittest.cc', 'browser/sessions/session_backend_unittest.cc', 'browser/sessions/session_service_test_helper.cc', @@ -2275,8 +2275,7 @@ 'third_party/wtl/include', ], 'sources!': [ - 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', - 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', + 'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', 'common/file_descriptor_set_unittest.cc', 'common/net/url_util_unittest.cc', ], @@ -2848,7 +2847,7 @@ 'suppress_wildcard': 1, 'type': 'none', 'dependencies': [ - '../base/base.gyp:base_unittests', + '../base/base.gyp:base_unittests', ], 'actions': [ { |