summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/go_button_gtk_unittest.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 18:49:41 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-15 18:49:41 +0000
commit12b1230bb1130818c1c297ae3b6aecd0a6c547bc (patch)
tree539350ce79241ea5051f207cdb934a2fcf25d21c /chrome/browser/gtk/go_button_gtk_unittest.cc
parentba9f91ad7c36842828979e53d1ef75df20a8245b (diff)
downloadchromium_src-12b1230bb1130818c1c297ae3b6aecd0a6c547bc.zip
chromium_src-12b1230bb1130818c1c297ae3b6aecd0a6c547bc.tar.gz
chromium_src-12b1230bb1130818c1c297ae3b6aecd0a6c547bc.tar.bz2
Try to fix yet another compile failure
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/go_button_gtk_unittest.cc')
-rw-r--r--chrome/browser/gtk/go_button_gtk_unittest.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/gtk/go_button_gtk_unittest.cc b/chrome/browser/gtk/go_button_gtk_unittest.cc
index e61c201..2e2f027 100644
--- a/chrome/browser/gtk/go_button_gtk_unittest.cc
+++ b/chrome/browser/gtk/go_button_gtk_unittest.cc
@@ -50,13 +50,13 @@ class GoButtonGtkTest : public testing::Test {
};
TEST_F(GoButtonGtkTest, ChangeModeGo) {
- go_.ChangeMode(GoButtonGtk::MODE_GO);
+ go_.ChangeMode(GoButtonGtk::MODE_GO, true);
EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.intended_mode());
EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.visible_mode());
}
TEST_F(GoButtonGtkTest, ChangeModeStop) {
- go_.ChangeMode(GoButtonGtk::MODE_STOP);
+ go_.ChangeMode(GoButtonGtk::MODE_STOP, true);
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.intended_mode());
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.visible_mode());
}
@@ -64,7 +64,7 @@ TEST_F(GoButtonGtkTest, ChangeModeStop) {
TEST_F(GoButtonGtkTest, ScheduleChangeModeNormalGo) {
peer_.set_visible_mode(GoButtonGtk::MODE_STOP);
peer_.set_state(GoButtonGtk::BS_NORMAL);
- go_.ScheduleChangeMode(GoButtonGtk::MODE_GO);
+ go_.ChangeMode(GoButtonGtk::MODE_GO, false);
EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.intended_mode());
EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.visible_mode());
}
@@ -72,7 +72,7 @@ TEST_F(GoButtonGtkTest, ScheduleChangeModeNormalGo) {
TEST_F(GoButtonGtkTest, ScheduleChangeModeHotGo) {
peer_.set_visible_mode(GoButtonGtk::MODE_STOP);
peer_.set_state(GoButtonGtk::BS_HOT);
- go_.ScheduleChangeMode(GoButtonGtk::MODE_GO);
+ go_.ChangeMode(GoButtonGtk::MODE_GO, false);
EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.intended_mode());
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.visible_mode());
}
@@ -80,7 +80,7 @@ TEST_F(GoButtonGtkTest, ScheduleChangeModeHotGo) {
TEST_F(GoButtonGtkTest, ScheduleChangeModeNormalStop) {
peer_.set_visible_mode(GoButtonGtk::MODE_GO);
peer_.set_state(GoButtonGtk::BS_NORMAL);
- go_.ScheduleChangeMode(GoButtonGtk::MODE_STOP);
+ go_.ChangeMode(GoButtonGtk::MODE_STOP, false);
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.intended_mode());
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.visible_mode());
}
@@ -88,7 +88,7 @@ TEST_F(GoButtonGtkTest, ScheduleChangeModeNormalStop) {
TEST_F(GoButtonGtkTest, ScheduleChangeModeHotStop) {
peer_.set_visible_mode(GoButtonGtk::MODE_GO);
peer_.set_state(GoButtonGtk::BS_HOT);
- go_.ScheduleChangeMode(GoButtonGtk::MODE_STOP);
+ go_.ChangeMode(GoButtonGtk::MODE_STOP, false);
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.intended_mode());
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.visible_mode());
}
@@ -97,7 +97,7 @@ TEST_F(GoButtonGtkTest, ScheduleChangeModeTimerHotStop) {
peer_.set_visible_mode(GoButtonGtk::MODE_GO);
peer_.set_state(GoButtonGtk::BS_HOT);
scoped_ptr<Task> task(peer_.CreateButtonTimerTask());
- go_.ScheduleChangeMode(GoButtonGtk::MODE_STOP);
+ go_.ChangeMode(GoButtonGtk::MODE_STOP, false);
EXPECT_EQ(GoButtonGtk::MODE_STOP, peer_.intended_mode());
EXPECT_EQ(GoButtonGtk::MODE_GO, peer_.visible_mode());
}