Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc |
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc |
index 11f4e87737c3d0a90afa0c2ea9d0753f487ef4e3..c971c2c6edcce0fc3e5bc6e12e3ba8b444c1309f 100644 |
--- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc |
+++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_browsertest.cc |
@@ -19,6 +19,7 @@ const char kDisplayDispositionMetric[] = "PasswordBubble.DisplayDisposition"; |
} // namespace |
typedef ManagePasswordsViewTest ManagePasswordsBubbleViewTest; |
+namespace metrics_util = password_manager::metrics_util; |
IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, BasicOpenAndClose) { |
EXPECT_FALSE(ManagePasswordsBubbleView::IsShowing()); |
@@ -66,13 +67,13 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, |
EXPECT_EQ( |
0, |
samples->GetCount( |
- password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING)); |
+ metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING)); |
EXPECT_EQ(0, |
samples->GetCount( |
- password_manager::metrics_util::MANUAL_WITH_PASSWORD_PENDING)); |
+ metrics_util::MANUAL_WITH_PASSWORD_PENDING)); |
EXPECT_EQ(1, |
samples->GetCount( |
- password_manager::metrics_util::MANUAL_MANAGE_PASSWORDS)); |
+ metrics_util::MANUAL_MANAGE_PASSWORDS)); |
} |
IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, |
@@ -85,13 +86,13 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, |
EXPECT_EQ( |
1, |
samples->GetCount( |
- password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING)); |
+ metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING)); |
EXPECT_EQ(0, |
samples->GetCount( |
- password_manager::metrics_util::MANUAL_WITH_PASSWORD_PENDING)); |
+ metrics_util::MANUAL_WITH_PASSWORD_PENDING)); |
EXPECT_EQ(0, |
samples->GetCount( |
- password_manager::metrics_util::MANUAL_MANAGE_PASSWORDS)); |
+ metrics_util::MANUAL_MANAGE_PASSWORDS)); |
} |
IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, |
@@ -107,11 +108,32 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, |
EXPECT_EQ( |
1, |
samples->GetCount( |
- password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING)); |
+ metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING)); |
EXPECT_EQ(1, |
samples->GetCount( |
- password_manager::metrics_util::MANUAL_WITH_PASSWORD_PENDING)); |
+ metrics_util::MANUAL_WITH_PASSWORD_PENDING)); |
EXPECT_EQ(0, |
samples->GetCount( |
- password_manager::metrics_util::MANUAL_MANAGE_PASSWORDS)); |
+ metrics_util::MANUAL_MANAGE_PASSWORDS)); |
+} |
+ |
+IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, |
+ CommandExecutionInAutomaticSaveState) { |
+ SetupAutomaticPassword(); |
+ ManagePasswordsBubbleView::CloseBubble(); |
+ // Re-opening should count as manual. |
+ ExecuteManagePasswordsCommand(); |
+ |
+ scoped_ptr<base::HistogramSamples> samples( |
+ GetSamples(kDisplayDispositionMetric)); |
+ EXPECT_EQ( |
+ 1, |
+ samples->GetCount( |
+ metrics_util::AUTOMATIC_GENERATED_PASSWORD_CONFIRMATION)); |
+ EXPECT_EQ(0, |
+ samples->GetCount( |
+ metrics_util::MANUAL_WITH_PASSWORD_PENDING)); |
+ EXPECT_EQ(1, |
+ samples->GetCount( |
+ metrics_util::MANUAL_MANAGE_PASSWORDS)); |
} |