Change password bubble for Mac.

chrome/browser/password_manager/password_manager_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
@@ skipping 111 matching lines @@
       base::WeakPtr<autofill::AutofillPopupDelegate> delegate) override {
     message_loop_runner_->Quit();
   }
 
  private:
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ObservingAutofillClient);
 };
 
+// For simplicity we assume that password store contains only 1 credentials.
 void CheckThatCredentialsStored(
     password_manager::TestPasswordStore* password_store,
     const base::string16& username,
     const base::string16& password) {
   auto& passwords_map = password_store->stored_passwords();
   ASSERT_EQ(1u, passwords_map.size());
   auto& passwords_vector = passwords_map.begin()->second;
   ASSERT_EQ(1u, passwords_vector.size());
   const autofill::PasswordForm& form = passwords_vector[0];
   EXPECT_EQ(username, form.username_value);
@@ skipping 256 matching lines @@
   std::string fill_and_submit =
       "document.getElementById('username_failed').value = 'temp';"
       "document.getElementById('password_failed').value = 'random';"
       "document.getElementById('submit_failed').click();";
 
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
   EXPECT_FALSE(prompt_observer->IsShowingPrompt());
 }
 
-// Disabled on Mac due to flakiness: crbug.com/493263
-#if defined(OS_MACOSX)
-#define MAYBE_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage \
-    DISABLED_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage
-#else
-#define MAYBE_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage \
-    NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage
-#endif
 IN_PROC_BROWSER_TEST_F(
     PasswordManagerBrowserTestBase,
-    MAYBE_NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage) {
+    NoPromptForFailedLoginFromSubFrameWithMultiFramesInPage) {
   NavigateToFile("/password/multi_frames.html");
 
   // Make sure that we don't prompt to save the password for a failed login
   // from a sub-frame with multiple frames in the same page.
   NavigationObserver observer(WebContents());
   scoped_ptr<PromptObserver> prompt_observer(
       PromptObserver::Create(WebContents()));
   std::string fill_and_submit =
       "var first_frame = document.getElementById('first_frame');"
       "var frame_doc = first_frame.contentDocument;"
@@ skipping 538 matching lines @@
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
               .get());
 
   // Spin the message loop to make sure the password store had a chance to save
   // the password.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   EXPECT_FALSE(password_store->IsEmpty());
 
-#if !defined(OS_MACOSX)
   CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
                              base::ASCIIToUTF16("random"));
-#endif
 }
 
 // Test for checking that no prompt is shown for URLs with file: scheme.
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        NoPromptForFileSchemeURLs) {
   GURL url = GetFileURL("password_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
 
   NavigationObserver observer(WebContents());
   scoped_ptr<PromptObserver> prompt_observer(
@@ skipping 647 matching lines @@
 
   content::SimulateMouseClickAt(
       WebContents(), 0, blink::WebMouseEvent::ButtonLeft, gfx::Point(left + 1,
                                                                      top + 1));
   // Make sure the popup would be shown.
   observing_autofill_client.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        ChangePwdFormBubbleShown) {
+// TODO(dvadym): Remove appending kEnablePasswordChangeSupport switch as soon as
+// it is removed on Mac. http://crbug.com/359315
+#if defined(OS_MACOSX)
+  // Add the enable-password-change-support feature.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      password_manager::features::kEnablePasswordChangeSupport.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+#endif
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver observer(WebContents());
   scoped_ptr<PromptObserver> prompt_observer(
       PromptObserver::Create(WebContents()));
   std::string fill_and_submit =
       "document.getElementById('chg_username_field').value = 'temp';"
       "document.getElementById('chg_password_field').value = 'random';"
       "document.getElementById('chg_new_password_1').value = 'random1';"
       "document.getElementById('chg_new_password_2').value = 'random1';"
       "document.getElementById('chg_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if defined(OS_MACOSX)
-  EXPECT_FALSE(prompt_observer->IsShowingPrompt());
-#else
   EXPECT_TRUE(prompt_observer->IsShowingPrompt());
-#endif
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        ChangePwdFormPushStateBubbleShown) {
+// TODO(dvadym): Remove appending kEnablePasswordChangeSupport switch as soon as
+// it is removed on Mac. http://crbug.com/359315
+#if defined(OS_MACOSX)
+  // Add the enable-password-change-support feature.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      password_manager::features::kEnablePasswordChangeSupport.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+#endif
   NavigateToFile("/password/password_push_state.html");
 
   NavigationObserver observer(WebContents());
   observer.set_quit_on_entry_committed(true);
   scoped_ptr<PromptObserver> prompt_observer(
       PromptObserver::Create(WebContents()));
   std::string fill_and_submit =
       "document.getElementById('chg_username_field').value = 'temp';"
       "document.getElementById('chg_password_field').value = 'random';"
       "document.getElementById('chg_new_password_1').value = 'random1';"
       "document.getElementById('chg_new_password_2').value = 'random1';"
       "document.getElementById('chg_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if defined(OS_MACOSX)
-  EXPECT_FALSE(prompt_observer->IsShowingPrompt());
-#else
   EXPECT_TRUE(prompt_observer->IsShowingPrompt());
-#endif
 }
 
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, NoPromptOnBack) {
   // Go to a successful landing page through submitting first, so that it is
   // reachable through going back, and the remembered page transition is form
   // submit. There is no need to submit non-empty strings.
   NavigateToFile("/password/password_form.html");
 
   NavigationObserver dummy_submit_observer(WebContents());
   std::string just_submit =
@@ skipping 327 matching lines @@
   content::RenderProcessHostWatcher iframe_killed(
       iframe->GetProcess(),
       content::RenderProcessHostWatcher::WATCH_FOR_PROCESS_EXIT);
 
   IPC::IpcSecurityTestUtil::PwnMessageReceived(
       iframe->GetProcess()->GetChannel(), illegal_forms_parsed);
 
   iframe_killed.Wait();
 }
 
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        ChangePwdNoAccountStored) {
+#if defined(OS_MACOSX)
+  // Add the enable-password-change-support feature.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      password_manager::features::kEnablePasswordChangeSupport.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+#endif
   ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
   NavigateToFile("/password/password_form.html");
 
   // Fill a form and submit through a <input type="submit"> button.
   NavigationObserver observer(WebContents());
   scoped_ptr<PromptObserver> prompt_observer(
       PromptObserver::Create(WebContents()));
 
   std::string fill_and_submit =
       "document.getElementById('chg_password_wo_username_field').value = "
@@ skipping 15 matching lines @@
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
               .get());
   // Spin the message loop to make sure the password store had a chance to save
   // the password.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   EXPECT_FALSE(password_store->IsEmpty());
   CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16(""),
                              base::ASCIIToUTF16("new_pw"));
 }
-#endif
 
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        ChangePwd1AccountStored) {
+#if defined(OS_MACOSX)
+  // Add the enable-password-change-support feature.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      password_manager::features::kEnablePasswordChangeSupport.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+#endif
   ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
   // At first let us save credentials to the PasswordManager.
   scoped_refptr<password_manager::TestPasswordStore> password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
               .get());
   autofill::PasswordForm signin_form;
   signin_form.signon_realm = embedded_test_server()->base_url().spec();
   signin_form.password_value = base::ASCIIToUTF16("pw");
@@ skipping 24 matching lines @@
           ->GetPendingPassword();
   prompt_observer->AcceptUpdatePrompt(pending_credentials);
 
   // Spin the message loop to make sure the password store had a chance to
   // update the password.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
                              base::ASCIIToUTF16("new_pw"));
 }
-#endif
 
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        PasswordOverridenUpdateBubbleShown) {
+#if defined(OS_MACOSX)
+  // Add the enable-password-change-support feature.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      password_manager::features::kEnablePasswordChangeSupport.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+#endif
   ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
   // At first let us save credentials to the PasswordManager.
   scoped_refptr<password_manager::TestPasswordStore> password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
               .get());
   autofill::PasswordForm signin_form;
   signin_form.signon_realm = embedded_test_server()->base_url().spec();
   signin_form.username_value = base::ASCIIToUTF16("temp");
@@ skipping 18 matching lines @@
   const autofill::PasswordForm stored_form =
       password_store->stored_passwords().begin()->second[0];
   prompt_observer->AcceptUpdatePrompt(stored_form);
   // Spin the message loop to make sure the password store had a chance to
   // update the password.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
                              base::ASCIIToUTF16("new_pw"));
 }
-#endif
 
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        PasswordNotOverridenUpdateBubbleNotShown) {
+#if defined(OS_MACOSX)
+  // Add the enable-password-change-support feature.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      password_manager::features::kEnablePasswordChangeSupport.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+#endif
   ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
   // At first let us save credentials to the PasswordManager.
   scoped_refptr<password_manager::TestPasswordStore> password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
               .get());
   autofill::PasswordForm signin_form;
   signin_form.signon_realm = embedded_test_server()->base_url().spec();
   signin_form.username_value = base::ASCIIToUTF16("temp");
@@ skipping 10 matching lines @@
       "document.getElementById('password_field').value = 'pw';"
       "document.getElementById('input_submit_button').click()";
   ASSERT_TRUE(content::ExecuteScript(RenderViewHost(), fill_and_submit));
   observer.Wait();
   // The stored password "pw" was not overriden, so update prompt is not
   // expected.
   EXPECT_FALSE(prompt_observer->IsShowingUpdatePrompt());
   CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
                              base::ASCIIToUTF16("pw"));
 }
-#endif
 
-// TODO(dvadym): Turn on this test when Change password UI will be implemented
-// for Mac. http://crbug.com/359315
-#if !defined(OS_MACOSX)
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        ChangePwdWhenTheFormContainNotUsernameTextfield) {
+#if defined(OS_MACOSX)
+  // Add the enable-password-change-support feature.
+  base::FeatureList::ClearInstanceForTesting();
+  scoped_ptr<base::FeatureList> feature_list(new base::FeatureList);
+  feature_list->InitializeFromCommandLine(
+      password_manager::features::kEnablePasswordChangeSupport.name, "");
+  base::FeatureList::SetInstance(std::move(feature_list));
+#endif

[vasilii, 2015/12/15 15:58:01]

Shouldn't it go to the test's setup?

[dvadym, 2015/12/16 14:16:30]

It will be removed with the flag in a couple of weeks after UI review.

   ASSERT_TRUE(ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled());
   // At first let us save credentials to the PasswordManager.
   scoped_refptr<password_manager::TestPasswordStore> password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
               .get());
   autofill::PasswordForm signin_form;
   signin_form.signon_realm = embedded_test_server()->base_url().spec();
   signin_form.password_value = base::ASCIIToUTF16("pw");
@@ skipping 22 matching lines @@
   const autofill::PasswordForm stored_form =
       password_store->stored_passwords().begin()->second[0];
   prompt_observer->AcceptUpdatePrompt(stored_form);
   // Spin the message loop to make sure the password store had a chance to
   // update the password.
   base::RunLoop run_loop;
   run_loop.RunUntilIdle();
   CheckThatCredentialsStored(password_store.get(), base::ASCIIToUTF16("temp"),
                              base::ASCIIToUTF16("new_pw"));
 }
-#endif
 
 // Test whether the password form with the username and password fields having
 // ambiguity in id attribute gets autofilled correctly.
 IN_PROC_BROWSER_TEST_F(
     PasswordManagerBrowserTestBase,
     AutofillSuggestionsForPasswordFormWithAmbiguousIdAttribute) {
   // At first let us save credentials to the PasswordManager.
   scoped_refptr<password_manager::PasswordStore> password_store =
       PasswordStoreFactory::GetForProfile(browser()->profile(),
                                           ServiceAccessType::IMPLICIT_ACCESS);
@@ skipping 627 matching lines @@
   std::string submit =
       "document.getElementById('username').value = 'temp';"
       "document.getElementById('password').value = 'mypassword';"
       "document.getElementById('submit').click();";
   VerifyPasswordIsSavedAndFilled(
       "/password/password_autocomplete_off_test.html", submit, "password",
       "mypassword");
 }
 
 }  // namespace password_manager