OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <string> | 5 #include <string> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/metrics/histogram_samples.h" | 8 #include "base/metrics/histogram_samples.h" |
9 #include "base/metrics/statistics_recorder.h" | 9 #include "base/metrics/statistics_recorder.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/infobars/confirm_infobar_delegate.h" | 11 #include "chrome/browser/infobars/confirm_infobar_delegate.h" |
12 #include "chrome/browser/infobars/infobar.h" | 12 #include "chrome/browser/infobars/infobar.h" |
| 13 #include "chrome/browser/infobars/infobar_manager.h" |
13 #include "chrome/browser/infobars/infobar_service.h" | 14 #include "chrome/browser/infobars/infobar_service.h" |
14 #include "chrome/browser/password_manager/password_store_factory.h" | 15 #include "chrome/browser/password_manager/password_store_factory.h" |
15 #include "chrome/browser/password_manager/test_password_store_service.h" | 16 #include "chrome/browser/password_manager/test_password_store_service.h" |
16 #include "chrome/browser/ui/browser.h" | 17 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
18 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
19 #include "chrome/test/base/test_switches.h" | 20 #include "chrome/test/base/test_switches.h" |
20 #include "chrome/test/base/ui_test_utils.h" | 21 #include "chrome/test/base/ui_test_utils.h" |
21 #include "components/autofill/core/browser/autofill_test_utils.h" | 22 #include "components/autofill/core/browser/autofill_test_utils.h" |
22 #include "components/password_manager/core/browser/test_password_store.h" | 23 #include "components/password_manager/core/browser/test_password_store.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 wait_for_path_ = path; | 69 wait_for_path_ = path; |
69 } | 70 } |
70 | 71 |
71 // content::NotificationObserver: | 72 // content::NotificationObserver: |
72 virtual void Observe(int type, | 73 virtual void Observe(int type, |
73 const content::NotificationSource& source, | 74 const content::NotificationSource& source, |
74 const content::NotificationDetails& details) OVERRIDE { | 75 const content::NotificationDetails& details) OVERRIDE { |
75 switch (type) { | 76 switch (type) { |
76 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED: | 77 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED: |
77 if (should_automatically_accept_infobar_) { | 78 if (should_automatically_accept_infobar_) { |
78 infobar_service_->infobar_at(0) | 79 infobar_service_->infobar_manager() |
| 80 ->infobar_at(0) |
79 ->delegate() | 81 ->delegate() |
80 ->AsConfirmInfoBarDelegate() | 82 ->AsConfirmInfoBarDelegate() |
81 ->Accept(); | 83 ->Accept(); |
82 } | 84 } |
83 infobar_shown_ = true; | 85 infobar_shown_ = true; |
84 return; | 86 return; |
85 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED: | 87 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED: |
86 infobar_removed_ = true; | 88 infobar_removed_ = true; |
87 return; | 89 return; |
88 default: | 90 default: |
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
649 DontPromptForPasswordFormWithDefaultValue) { | 651 DontPromptForPasswordFormWithDefaultValue) { |
650 NavigateToFile("/password/password_form_with_default_value.html"); | 652 NavigateToFile("/password/password_form_with_default_value.html"); |
651 | 653 |
652 // Don't prompt if we navigate away even if there is a password value since | 654 // Don't prompt if we navigate away even if there is a password value since |
653 // it's not coming from the user. | 655 // it's not coming from the user. |
654 NavigationObserver observer(WebContents()); | 656 NavigationObserver observer(WebContents()); |
655 NavigateToFile("/password/done.html"); | 657 NavigateToFile("/password/done.html"); |
656 observer.Wait(); | 658 observer.Wait(); |
657 EXPECT_FALSE(observer.infobar_shown()); | 659 EXPECT_FALSE(observer.infobar_shown()); |
658 } | 660 } |
OLD | NEW |