| 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" | |
| 14 #include "chrome/browser/infobars/infobar_service.h" | 13 #include "chrome/browser/infobars/infobar_service.h" |
| 15 #include "chrome/browser/password_manager/password_store_factory.h" | 14 #include "chrome/browser/password_manager/password_store_factory.h" |
| 16 #include "chrome/browser/password_manager/test_password_store_service.h" | 15 #include "chrome/browser/password_manager/test_password_store_service.h" |
| 17 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
| 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 19 #include "chrome/test/base/in_process_browser_test.h" | 18 #include "chrome/test/base/in_process_browser_test.h" |
| 20 #include "chrome/test/base/test_switches.h" | 19 #include "chrome/test/base/test_switches.h" |
| 21 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
| 22 #include "components/autofill/core/browser/autofill_test_utils.h" | 21 #include "components/autofill/core/browser/autofill_test_utils.h" |
| 23 #include "components/password_manager/core/browser/test_password_store.h" | 22 #include "components/password_manager/core/browser/test_password_store.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 wait_for_path_ = path; | 68 wait_for_path_ = path; |
| 70 } | 69 } |
| 71 | 70 |
| 72 // content::NotificationObserver: | 71 // content::NotificationObserver: |
| 73 virtual void Observe(int type, | 72 virtual void Observe(int type, |
| 74 const content::NotificationSource& source, | 73 const content::NotificationSource& source, |
| 75 const content::NotificationDetails& details) OVERRIDE { | 74 const content::NotificationDetails& details) OVERRIDE { |
| 76 switch (type) { | 75 switch (type) { |
| 77 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED: | 76 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED: |
| 78 if (should_automatically_accept_infobar_) { | 77 if (should_automatically_accept_infobar_) { |
| 79 infobar_service_->infobar_manager() | 78 infobar_service_->infobar_at(0)->delegate()-> |
| 80 ->infobar_at(0) | 79 AsConfirmInfoBarDelegate()->Accept(); |
| 81 ->delegate() | |
| 82 ->AsConfirmInfoBarDelegate() | |
| 83 ->Accept(); | |
| 84 } | 80 } |
| 85 infobar_shown_ = true; | 81 infobar_shown_ = true; |
| 86 return; | 82 return; |
| 87 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED: | 83 case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED: |
| 88 infobar_removed_ = true; | 84 infobar_removed_ = true; |
| 89 return; | 85 return; |
| 90 default: | 86 default: |
| 91 NOTREACHED(); | 87 NOTREACHED(); |
| 92 return; | 88 return; |
| 93 } | 89 } |
| (...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 DontPromptForPasswordFormWithDefaultValue) { | 647 DontPromptForPasswordFormWithDefaultValue) { |
| 652 NavigateToFile("/password/password_form_with_default_value.html"); | 648 NavigateToFile("/password/password_form_with_default_value.html"); |
| 653 | 649 |
| 654 // Don't prompt if we navigate away even if there is a password value since | 650 // Don't prompt if we navigate away even if there is a password value since |
| 655 // it's not coming from the user. | 651 // it's not coming from the user. |
| 656 NavigationObserver observer(WebContents()); | 652 NavigationObserver observer(WebContents()); |
| 657 NavigateToFile("/password/done.html"); | 653 NavigateToFile("/password/done.html"); |
| 658 observer.Wait(); | 654 observer.Wait(); |
| 659 EXPECT_FALSE(observer.infobar_shown()); | 655 EXPECT_FALSE(observer.infobar_shown()); |
| 660 } | 656 } |
| OLD | NEW |