Index: chrome/browser/password_manager/password_manager_browsertest.cc |
=================================================================== |
--- chrome/browser/password_manager/password_manager_browsertest.cc (revision 212931) |
+++ chrome/browser/password_manager/password_manager_browsertest.cc (working copy) |
@@ -41,14 +41,6 @@ |
virtual ~NavigationObserver() {} |
- void Wait() { |
- message_loop_runner_->Run(); |
- } |
- |
- bool InfoBarWasShown() { |
- return info_bar_shown_; |
- } |
- |
// content::NotificationObserver: |
virtual void Observe(int type, |
const content::NotificationSource& source, |
@@ -61,7 +53,7 @@ |
info_bar_shown_ = true; |
} |
- // content::WebContentsObserver |
+ // content::WebContentsObserver: |
virtual void DidFinishLoad( |
int64 frame_id, |
const GURL& validated_url, |
@@ -70,6 +62,12 @@ |
message_loop_runner_->Quit(); |
} |
+ bool infobar_shown() { return info_bar_shown_; } |
+ |
+ void Wait() { |
+ message_loop_runner_->Run(); |
+ } |
+ |
private: |
scoped_refptr<content::MessageLoopRunner> message_loop_runner_; |
bool info_bar_shown_; |
@@ -118,7 +116,7 @@ |
"document.getElementById('submit_button').click()"; |
ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit)); |
observer.Wait(); |
- EXPECT_TRUE(observer.InfoBarWasShown()); |
+ EXPECT_TRUE(observer.infobar_shown()); |
} |
IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTest, NoPromptForOtherXHR) { |
@@ -139,5 +137,5 @@ |
"send_xhr()"; |
ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_navigate)); |
observer.Wait(); |
- EXPECT_FALSE(observer.InfoBarWasShown()); |
+ EXPECT_FALSE(observer.infobar_shown()); |
} |