Chromium Code Reviews| Index: chrome/browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc |
| diff --git a/chrome/browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc b/chrome/browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc |
| index a1121ec0e70d10582419f630e2881d96d927e139..eca29fff82ee23ff57a9bbe453b9067de6b84e0d 100644 |
| --- a/chrome/browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc |
| +++ b/chrome/browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc |
| @@ -18,6 +18,8 @@ |
| #include "chrome/test/base/chrome_render_view_host_test_harness.h" |
| #include "components/autofill/core/browser/autofill_metrics.h" |
| #include "components/autofill/core/browser/credit_card.h" |
| +#include "components/autofill/core/common/autofill_pref_names.h" |
| +#include "components/user_prefs/user_prefs.h" |
| #include "content/public/browser/navigation_handle.h" |
| #include "testing/gmock/include/gmock/gmock.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -61,8 +63,11 @@ class SaveCardBubbleControllerImplTest : public BrowserWithTestWindowTest { |
| void SetUp() override { |
| BrowserWithTestWindowTest::SetUp(); |
| AddTab(browser(), GURL("about:blank")); |
| - TestSaveCardBubbleControllerImpl::CreateForTesting( |
| - browser()->tab_strip_model()->GetActiveWebContents()); |
| + content::WebContents* web_contents = |
| + browser()->tab_strip_model()->GetActiveWebContents(); |
| + TestSaveCardBubbleControllerImpl::CreateForTesting(web_contents); |
| + user_prefs::UserPrefs::Get(web_contents->GetBrowserContext()) |
| + ->SetBoolean(prefs::kAutofillAcceptSaveCreditCardPromptState, true); |
| } |
| BrowserWindow* CreateBrowserWindow() override { |
| @@ -161,7 +166,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Local_FirstShow_ShowBubble) { |
| EXPECT_THAT( |
| histogram_tester.GetAllSamples( |
| - "Autofill.SaveCreditCardPrompt.Local.FirstShow"), |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyAccepted"), |
| ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1))); |
| } |
| @@ -174,7 +179,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Local_Reshows_ShowBubble) { |
| EXPECT_THAT( |
| histogram_tester.GetAllSamples( |
| - "Autofill.SaveCreditCardPrompt.Local.Reshows"), |
| + "Autofill.SaveCreditCardPrompt.Local.Reshows.PreviouslyAccepted"), |
| ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1))); |
| } |
| @@ -186,7 +191,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| EXPECT_THAT( |
| histogram_tester.GetAllSamples( |
| - "Autofill.SaveCreditCardPrompt.Upload.FirstShow"), |
| + "Autofill.SaveCreditCardPrompt.Upload.FirstShow.PreviouslyAccepted"), |
| ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1))); |
| } |
| @@ -198,7 +203,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| EXPECT_THAT( |
| histogram_tester.GetAllSamples( |
| - "Autofill.SaveCreditCardPrompt.Upload.FirstShow"), |
| + "Autofill.SaveCreditCardPrompt.Upload.FirstShow.PreviouslyAccepted"), |
| ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1))); |
| } |
| @@ -211,7 +216,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Upload_Reshows_ShowBubble) { |
| EXPECT_THAT( |
| histogram_tester.GetAllSamples( |
| - "Autofill.SaveCreditCardPrompt.Upload.Reshows"), |
| + "Autofill.SaveCreditCardPrompt.Upload.Reshows.PreviouslyAccepted"), |
| ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1))); |
| } |
| @@ -224,7 +229,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Local_FirstShow_SaveButton) { |
| controller()->OnBubbleClosed(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.FirstShow", |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_ACCEPTED, 1); |
| } |
| @@ -237,7 +242,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Local_Reshows_SaveButton) { |
| controller()->OnBubbleClosed(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.Reshows", |
| + "Autofill.SaveCreditCardPrompt.Local.Reshows.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_ACCEPTED, 1); |
| } |
| @@ -249,7 +254,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Local_FirstShow_CancelButton) { |
| controller()->OnBubbleClosed(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.FirstShow", |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_DENIED, 1); |
| } |
| @@ -262,11 +267,63 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Local_Reshows_CancelButton) { |
| controller()->OnBubbleClosed(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.Reshows", |
| + "Autofill.SaveCreditCardPrompt.Local.Reshows.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_DENIED, 1); |
| } |
| TEST_F(SaveCardBubbleControllerImplTest, |
| + Metrics_Local_FirstShow_CancelButton_FirstShow) { |
| + base::HistogramTester histogram_tester; |
| + ShowLocalBubble(); |
| + controller()->OnCancelButton(); |
| + controller()->OnBubbleClosed(); |
| + |
| + ShowLocalBubble(); |
| + controller()->OnCancelButton(); |
| + controller()->OnBubbleClosed(); |
| + |
| + EXPECT_THAT( |
| + histogram_tester.GetAllSamples( |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyAccepted"), |
| + ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_END_DENIED, 1))); |
| + EXPECT_THAT( |
| + histogram_tester.GetAllSamples( |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyDenied"), |
| + ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_END_DENIED, 1))); |
| +} |
| + |
| +TEST_F(SaveCardBubbleControllerImplTest, |
| + Metrics_Local_FirstShow_CancelButton_FirstShow_SaveButton_FirstShow) { |
| + base::HistogramTester histogram_tester; |
| + ShowLocalBubble(); |
| + controller()->OnCancelButton(); |
| + controller()->OnBubbleClosed(); |
| + |
| + ShowLocalBubble(); |
| + controller()->OnSaveButton(); |
| + controller()->OnBubbleClosed(); |
| + |
| + ShowLocalBubble(); |
| + |
| + EXPECT_THAT( |
| + histogram_tester.GetAllSamples( |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyAccepted"), |
| + ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 2), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 2), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_END_DENIED, 1))); |
| + EXPECT_THAT( |
| + histogram_tester.GetAllSamples( |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyDenied"), |
| + ElementsAre(Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOWN, 1), |
| + Bucket(AutofillMetrics::SAVE_CARD_PROMPT_END_ACCEPTED, 1))); |
|
sebsg
2017/04/25 15:32:28
Can you also add one for the CreditCardInfoBar?
csashi
2017/04/25 17:22:52
Please see chrome/browser/autofill/autofill_save_c
|
| +} |
| + |
| +TEST_F(SaveCardBubbleControllerImplTest, |
| Metrics_Local_FirstShow_NavigateWhileShowing) { |
| ShowLocalBubble(); |
| @@ -277,7 +334,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| controller()->SimulateNavigation(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.FirstShow", |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_NAVIGATION_SHOWING, 1); |
| } |
| @@ -292,7 +349,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| controller()->SimulateNavigation(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.Reshows", |
| + "Autofill.SaveCreditCardPrompt.Local.Reshows.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_NAVIGATION_SHOWING, 1); |
| } |
| @@ -307,7 +364,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| controller()->SimulateNavigation(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.FirstShow", |
| + "Autofill.SaveCreditCardPrompt.Local.FirstShow.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_NAVIGATION_HIDDEN, 1); |
| } |
| @@ -323,7 +380,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| controller()->SimulateNavigation(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Local.Reshows", |
| + "Autofill.SaveCreditCardPrompt.Local.Reshows.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_END_NAVIGATION_HIDDEN, 1); |
| } |
| @@ -334,7 +391,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Upload_FirstShow_LearnMore) { |
| controller()->OnLearnMoreClicked(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Upload.FirstShow", |
| + "Autofill.SaveCreditCardPrompt.Upload.FirstShow.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_DISMISS_CLICK_LEARN_MORE, 1); |
| } |
| @@ -346,7 +403,7 @@ TEST_F(SaveCardBubbleControllerImplTest, Metrics_Upload_Reshows_LearnMore) { |
| controller()->OnLearnMoreClicked(); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Upload.Reshows", |
| + "Autofill.SaveCreditCardPrompt.Upload.Reshows.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_DISMISS_CLICK_LEARN_MORE, 1); |
| } |
| @@ -358,7 +415,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| controller()->OnLegalMessageLinkClicked(GURL("http://www.example.com")); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Upload.FirstShow", |
| + "Autofill.SaveCreditCardPrompt.Upload.FirstShow.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_DISMISS_CLICK_LEGAL_MESSAGE, 1); |
| } |
| @@ -371,7 +428,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| controller()->OnLegalMessageLinkClicked(GURL("http://www.example.com")); |
| histogram_tester.ExpectUniqueSample( |
| - "Autofill.SaveCreditCardPrompt.Upload.Reshows", |
| + "Autofill.SaveCreditCardPrompt.Upload.Reshows.PreviouslyAccepted", |
| AutofillMetrics::SAVE_CARD_PROMPT_DISMISS_CLICK_LEGAL_MESSAGE, 1); |
| } |
| @@ -394,7 +451,7 @@ TEST_F(SaveCardBubbleControllerImplTest, |
| EXPECT_THAT( |
| histogram_tester.GetAllSamples( |
| - "Autofill.SaveCreditCardPrompt.Upload.FirstShow"), |
| + "Autofill.SaveCreditCardPrompt.Upload.FirstShow.PreviouslyAccepted"), |
| ElementsAre( |
| Bucket(AutofillMetrics::SAVE_CARD_PROMPT_SHOW_REQUESTED, 1), |
| Bucket(AutofillMetrics::SAVE_CARD_PROMPT_END_INVALID_LEGAL_MESSAGE, |