| Index: chrome/browser/ui/login/login_prompt_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/login/login_prompt_browsertest.cc (revision 91968)
|
| +++ chrome/browser/ui/login/login_prompt_browsertest.cc (working copy)
|
| @@ -11,6 +11,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/login/login_prompt.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/common/chrome_notification_types.h"
|
| #include "chrome/test/in_process_browser_test.h"
|
| #include "chrome/test/ui_test_utils.h"
|
| #include "content/browser/browser_thread.h"
|
| @@ -73,7 +74,7 @@
|
| auth_supplied_count_(0),
|
| auth_cancelled_count_(0) {}
|
|
|
| - virtual void Observe(NotificationType type,
|
| + virtual void Observe(int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details);
|
|
|
| @@ -100,20 +101,20 @@
|
| };
|
|
|
| void LoginPromptBrowserTestObserver::Observe(
|
| - NotificationType type,
|
| + int type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| - if (type == NotificationType::AUTH_NEEDED) {
|
| + if (type == chrome::NOTIFICATION_AUTH_NEEDED) {
|
| LoginNotificationDetails* login_details =
|
| Details<LoginNotificationDetails>(details).ptr();
|
| AddHandler(login_details->handler());
|
| auth_needed_count_++;
|
| - } else if (type == NotificationType::AUTH_SUPPLIED) {
|
| + } else if (type == chrome::NOTIFICATION_AUTH_SUPPLIED) {
|
| AuthSuppliedLoginNotificationDetails* login_details =
|
| Details<AuthSuppliedLoginNotificationDetails>(details).ptr();
|
| RemoveHandler(login_details->handler());
|
| auth_supplied_count_++;
|
| - } else if (type == NotificationType::AUTH_CANCELLED) {
|
| + } else if (type == chrome::NOTIFICATION_AUTH_CANCELLED) {
|
| LoginNotificationDetails* login_details =
|
| Details<LoginNotificationDetails>(details).ptr();
|
| RemoveHandler(login_details->handler());
|
| @@ -141,12 +142,12 @@
|
|
|
| void LoginPromptBrowserTestObserver::Register(
|
| const NotificationSource& source) {
|
| - registrar_.Add(this, NotificationType::AUTH_NEEDED, source);
|
| - registrar_.Add(this, NotificationType::AUTH_SUPPLIED, source);
|
| - registrar_.Add(this, NotificationType::AUTH_CANCELLED, source);
|
| + registrar_.Add(this, chrome::NOTIFICATION_AUTH_NEEDED, source);
|
| + registrar_.Add(this, chrome::NOTIFICATION_AUTH_SUPPLIED, source);
|
| + registrar_.Add(this, chrome::NOTIFICATION_AUTH_CANCELLED, source);
|
| }
|
|
|
| -template <NotificationType::Type T>
|
| +template <int T>
|
| class WindowedNavigationObserver
|
| : public ui_test_utils::WindowedNotificationObserver {
|
| public:
|
| @@ -155,16 +156,16 @@
|
| T, Source<NavigationController>(controller)) {}
|
| };
|
|
|
| -typedef WindowedNavigationObserver<NotificationType::LOAD_STOP>
|
| +typedef WindowedNavigationObserver<content::NOTIFICATION_LOAD_STOP>
|
| WindowedLoadStopObserver;
|
|
|
| -typedef WindowedNavigationObserver<NotificationType::AUTH_NEEDED>
|
| +typedef WindowedNavigationObserver<chrome::NOTIFICATION_AUTH_NEEDED>
|
| WindowedAuthNeededObserver;
|
|
|
| -typedef WindowedNavigationObserver<NotificationType::AUTH_CANCELLED>
|
| +typedef WindowedNavigationObserver<chrome::NOTIFICATION_AUTH_CANCELLED>
|
| WindowedAuthCancelledObserver;
|
|
|
| -typedef WindowedNavigationObserver<NotificationType::AUTH_SUPPLIED>
|
| +typedef WindowedNavigationObserver<chrome::NOTIFICATION_AUTH_SUPPLIED>
|
| WindowedAuthSuppliedObserver;
|
|
|
| const char* kPrefetchAuthPage = "files/login/prefetch.html";
|
|
|