Revert "Revert of Reland: Switch WindowedNotificationObserver to use base::RunLoop. (patchset #3 id…

chrome/browser/ui/login/login_handler_test_utils.cc

 // Copyright 2014 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/browser/ui/login/login_handler_test_utils.h"
 
 #include "chrome/browser/ui/login/login_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 LoginPromptBrowserTestObserver::LoginPromptBrowserTestObserver()
@@ skipping 39 matching lines @@
   handlers_.erase(i);
 }
 
 void LoginPromptBrowserTestObserver::Register(
     const content::NotificationSource& 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);
 }
 
+void LoginPromptBrowserTestObserver::UnregisterAll() {
+  registrar_.RemoveAll();
+}
+
 WindowedLoadStopObserver::WindowedLoadStopObserver(
     content::NavigationController* controller,
     int notification_count)
     : WindowedNavigationObserver<content::NOTIFICATION_LOAD_STOP>(controller),
       remaining_notification_count_(notification_count) {
   // This should really be an ASSERT, if those were allowed in a method which
   // does not return void.
   EXPECT_LE(0, remaining_notification_count_);
 }
 
 void WindowedLoadStopObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   ASSERT_LT(0, remaining_notification_count_);
   if (--remaining_notification_count_ == 0)
     WindowedNotificationObserver::Observe(type, source, details);
 }