Index: chrome/browser/instant/instant_browsertest.cc |
=================================================================== |
--- chrome/browser/instant/instant_browsertest.cc (revision 91880) |
+++ chrome/browser/instant/instant_browsertest.cc (working copy) |
@@ -51,7 +51,7 @@ |
if (!model->loaded()) { |
model->Load(); |
ui_test_utils::WaitForNotification( |
- NotificationType::TEMPLATE_URL_SERVICE_LOADED); |
+ chrome::TEMPLATE_URL_SERVICE_LOADED); |
} |
ASSERT_TRUE(model->loaded()); |
@@ -123,7 +123,7 @@ |
ASSERT_NO_FATAL_FAILURE(FindLocationBar()); |
location_bar_->location_entry()->SetUserText(UTF8ToUTF16(text)); |
ui_test_utils::WaitForNotification( |
- NotificationType::INSTANT_CONTROLLER_SHOWN); |
+ chrome::INSTANT_CONTROLLER_SHOWN); |
} |
const string16& GetSuggestion() const { |
@@ -599,7 +599,7 @@ |
// When the response comes back that the page doesn't support instant the tab |
// should be closed. |
- ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED); |
+ ui_test_utils::WaitForNotification(chrome::TAB_CLOSED); |
EXPECT_FALSE(browser()->instant()->IsShowingInstant()); |
EXPECT_FALSE(browser()->instant()->is_displayable()); |
EXPECT_TRUE(browser()->instant()->is_active()); |
@@ -649,7 +649,7 @@ |
// When the response comes back that the page doesn't support instant the tab |
// should be closed. |
- ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED); |
+ ui_test_utils::WaitForNotification(chrome::TAB_CLOSED); |
EXPECT_FALSE(browser()->instant()->IsShowingInstant()); |
EXPECT_FALSE(browser()->instant()->is_displayable()); |
// But because the omnibox is still open, instant should be active. |
@@ -705,7 +705,7 @@ |
ASSERT_FALSE(browser()->instant()->is_displayable()); |
// When instant sees the 403, it should close the tab. |
- ui_test_utils::WaitForNotification(NotificationType::TAB_CLOSED); |
+ ui_test_utils::WaitForNotification(chrome::TAB_CLOSED); |
ASSERT_FALSE(browser()->instant()->GetPreviewContents()); |
ASSERT_TRUE(browser()->instant()->is_active()); |
ASSERT_FALSE(browser()->instant()->is_displayable()); |
@@ -869,7 +869,7 @@ |
ASSERT_NO_FATAL_FAILURE(SetupLocationBar()); |
// Wait for notification that the instant API has been determined. |
ui_test_utils::WaitForNotification( |
- NotificationType::INSTANT_SUPPORT_DETERMINED); |
+ chrome::INSTANT_SUPPORT_DETERMINED); |
// As long as we get the notification we're good (the renderer didn't crash). |
} |
@@ -894,11 +894,11 @@ |
// Wait for the load to fail (because instant disables downloads). |
printf("1\n"); |
ui_test_utils::WaitForNotification( |
- NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR); |
+ chrome::FAIL_PROVISIONAL_LOAD_WITH_ERROR); |
printf("2\n"); |
ui_test_utils::WindowedNotificationObserver download_observer( |
- NotificationType::DOWNLOAD_INITIATED, |
+ chrome::DOWNLOAD_INITIATED, |
NotificationService::AllSources()); |
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_RETURN)); |
printf("3\n"); |