Update PasswordManagerBrowserTest to use the new Observer class from InfoBarManager.

chrome/browser/password_manager/password_manager_browsertest.cc

 // Copyright 2013 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 <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 23 matching lines @@
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 
 // NavigationObserver ---------------------------------------------------------
 
 namespace {
 
 // Observer that waits for navigation to complete and for the password infobar
 // to be shown.
-class NavigationObserver : public content::NotificationObserver,
-                           public content::WebContentsObserver {
+class NavigationObserver : public content::WebContentsObserver,
+                           public InfoBarManager::Observer {
  public:
   explicit NavigationObserver(content::WebContents* web_contents)
       : content::WebContentsObserver(web_contents),
         message_loop_runner_(new content::MessageLoopRunner),
         infobar_shown_(false),
         infobar_removed_(false),
         should_automatically_accept_infobar_(true),
         infobar_service_(InfoBarService::FromWebContents(web_contents)) {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
-                   content::Source<InfoBarService>(infobar_service_));
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
-                   content::Source<InfoBarService>(infobar_service_));
+    infobar_service_->AddObserver(this);
   }
 
-  virtual ~NavigationObserver() {}
+  virtual ~NavigationObserver() {
+    if (infobar_service_)
+      infobar_service_->RemoveObserver(this);
+  }
 
   // Normally Wait() will not return until a main frame navigation occurs.
   // If a path is set, Wait() will return after this path has been seen,
   // regardless of the frame that navigated. Useful for multi-frame pages.
   void SetPathToWaitFor(const std::string& path) {
     wait_for_path_ = path;
   }
 
-  // content::NotificationObserver:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
-    switch (type) {
-      case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED:
-        if (should_automatically_accept_infobar_) {
-          infobar_service_->infobar_at(0)->delegate()->
-              AsConfirmInfoBarDelegate()->Accept();
-        }
-        infobar_shown_ = true;
-        return;
-      case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED:
-        infobar_removed_ = true;
-        return;
-      default:
-        NOTREACHED();
-        return;
-    }
-  }
-
   // content::WebContentsObserver:
   virtual void DidFinishLoad(
       int64 frame_id,
       const GURL& validated_url,
       bool is_main_frame,
       content::RenderViewHost* render_view_host) OVERRIDE {
     if (!wait_for_path_.empty()) {
       if (validated_url.path() == wait_for_path_)
         message_loop_runner_->Quit();
     } else if (is_main_frame) {
       message_loop_runner_->Quit();
     }
   }
 
   bool infobar_shown() const { return infobar_shown_; }
   bool infobar_removed() const { return infobar_removed_; }
 
   void disable_should_automatically_accept_infobar() {
     should_automatically_accept_infobar_ = false;
   }
 
   void Wait() {
     message_loop_runner_->Run();
   }
 
  private:
+  // InfoBarManager::Observer

[Peter Kasting, 2014/04/18 23:52:39]

Nit: Add trailing colon

[tfarina, 2014/04/19 18:43:10]

Done.

+  virtual void OnInfoBarAdded(InfoBar* infobar) OVERRIDE {
+    if (should_automatically_accept_infobar_) {
+      infobar_service_->infobar_at(0)
+          ->delegate()
+          ->AsConfirmInfoBarDelegate()
+          ->Accept();

[Peter Kasting, 2014/04/18 23:52:39]

Nit: Wrap like the old code did

[tfarina, 2014/04/19 18:43:10]

Done.

+    }
+    infobar_shown_ = true;
+  }

[Ilya Sherman, 2014/04/19 04:21:27]

nit: Please leave a blank line between method definitions.

+  virtual void OnInfoBarRemoved(InfoBar* infobar, bool animate) OVERRIDE {
+    infobar_removed_ = true;
+  }
+  virtual void OnInfoBarReplaced(InfoBar* old_infobar,
+                                 InfoBar* new_infobar) OVERRIDE {}

[Peter Kasting, 2014/04/18 23:52:39]

Subclasses shouldn't need to override methods they don't care about.  Can you
remove this, and make all the base class methods have an empty body instead of
being pure virtual?

[tfarina, 2014/04/19 18:43:10]

Done.

+  virtual void OnManagerShuttingDown(InfoBarManager* manager) OVERRIDE {
+    DCHECK_EQ(infobar_service_, manager);

[Ilya Sherman, 2014/04/19 04:21:27]

nit: ASSERT_EQ is preferable in tests, as it doesn't crash the whole test suite.

[tfarina, 2014/04/19 18:43:10]

Done.

+    infobar_service_->RemoveObserver(this);
+    infobar_service_ = NULL;
+  }
+
   std::string wait_for_path_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
   bool infobar_shown_;
   bool infobar_removed_;
   // If |should_automatically_accept_infobar_| is true, then whenever the test
   // sees an infobar added, it will click its accepting button. Default = true.
   bool should_automatically_accept_infobar_;
-  content::NotificationRegistrar registrar_;
   InfoBarService* infobar_service_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationObserver);
 };
 
 }  // namespace
 
 
 // PasswordManagerBrowserTest -------------------------------------------------
 
@@ skipping 511 matching lines @@
                        DontPromptForPasswordFormWithDefaultValue) {
   NavigateToFile("/password/password_form_with_default_value.html");
 
   // Don't prompt if we navigate away even if there is a password value since
   // it's not coming from the user.
   NavigationObserver observer(WebContents());
   NavigateToFile("/password/done.html");
   observer.Wait();
   EXPECT_FALSE(observer.infobar_shown());
 }