Move password-related methods from core.js to password_controller.js.

ios/chrome/browser/passwords/password_controller_unittest.mm

 // Copyright 2012 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.
 
 #import "ios/chrome/browser/passwords/password_controller.h"
 
 #import <Foundation/Foundation.h>
 
 #include <memory>
 #include <utility>
@@ skipping 731 matching lines @@
 static NSString* kInputFieldValueVerificationScript =
     @"var result='';"
      "var inputs = document.getElementsByTagName('input');"
      "for(var i = 0; i < inputs.length; i++){"
      "  var input = inputs[i];"
      "  if (input.value) {"
      "    result += input.id + '=' + input.value +';';"
      "  }"
      "}; result";
 
+struct TestDataForPasswordFormDetection {

[Eugene But (OOO till 7-30), 2017/04/11 16:19:40]

Could you please add comments to this struct and its data

[danyao, 2017/04/11 18:05:06]

Done.

+  NSString* pageContent;

[Eugene But (OOO till 7-30), 2017/04/11 16:19:40]

s/pageContent/page_content

Same comment form containsPassword, testData

[danyao, 2017/04/11 18:05:06]

Done.

+  NSNumber* containsPassword;

[Eugene But (OOO till 7-30), 2017/04/11 16:19:40]

Do you want to use bool or BOOL instead of NSNumber?

[danyao, 2017/04/11 18:05:05]

Done.

+};
+
+TEST_F(PasswordControllerTest, HasPasswordField) {

[Eugene But (OOO till 7-30), 2017/04/11 16:19:40]

Could you please add comments to this test.

[danyao, 2017/04/11 18:05:06]

Done.

+  TestDataForPasswordFormDetection testData[] = {
+      // Form without a password field.
+      {@"<form><input type='text' name='password'></form>", @NO},
+      // Form with a password field.
+      {@"<form><input type='password' name='password'></form>", @YES}};
+  for (size_t i = 0; i < arraysize(testData); i++) {
+    TestDataForPasswordFormDetection& data = testData[i];
+    LoadHtml(data.pageContent);
+    id result = ExecuteJavaScript(@"__gCrWeb.hasPasswordFieldTestOnly()");
+    EXPECT_NSEQ(data.containsPassword, result)
+        << " in test " << i << ": "
+        << base::SysNSStringToUTF8(data.pageContent);
+  }
+}
+
+TEST_F(PasswordControllerTest, HasPasswordFieldinFrame) {
+  TestDataForPasswordFormDetection data = {
+    // Form with a password field in a nested iframe.
+    @"<iframe name='pf'></iframe>"
+     "<script>"
+     "  var doc = frames['pf'].document.open();"
+     "  doc.write('<form><input type=\\'password\\'></form>');"
+     "  doc.close();"
+     "</script>",
+    @YES
+  };
+  LoadHtml(data.pageContent);
+  id result = ExecuteJavaScript(@"__gCrWeb.hasPasswordFieldTestOnly()");
+  EXPECT_NSEQ(data.containsPassword, result)
+      << base::SysNSStringToUTF8(data.pageContent);
+}
+
 struct FillPasswordFormTestData {
   const std::string origin;
   const std::string action;
   const char* username_field;
   const char* username_value;
   const char* password_field;
   const char* password_value;
   const BOOL should_succeed;
   NSString* expected_result;
 };
 
 // Test that filling password forms works correctly.
 TEST_F(PasswordControllerTest, FillPasswordForm) {
   LoadHtml(kHtmlWithMultiplePasswordForms);
 
-  EXPECT_NSEQ(@YES, ExecuteJavaScript(@"__gCrWeb.hasPasswordField()"));
+  // TODO(danyao): can we remove this assertion? This call is the only reason
+  // why hasPasswordFieldTestOnly is a public API on gCrWeb. If the page does
+  // not contain a password field, shouldn't one of the expectations of the
+  // remaining tests also fail?
+  EXPECT_NSEQ(@YES, ExecuteJavaScript(@"__gCrWeb.hasPasswordFieldTestOnly()"));
 
   const std::string base_url = BaseUrl();
   // clang-format off
   FillPasswordFormTestData test_data[] = {
     // Basic test: one-to-one match on the first password form.
     {
       base_url,
       base_url,
       "u0",
       "test_user",
@@ skipping 158 matching lines @@
   });
   EXPECT_EQ(2, success_counter);
   id result = ExecuteJavaScript(kInputFieldValueVerificationScript);
   EXPECT_NSEQ(@"u2=john.doe@gmail.com;p2=super!secret;"
                "u3=john.doe@gmail.com;p3=super!secret;",
               result);
 }
 
 BOOL PasswordControllerTest::BasicFormFill(NSString* html) {
   LoadHtml(html);
-  EXPECT_NSEQ(@YES, ExecuteJavaScript(@"__gCrWeb.hasPasswordField()"));
+  EXPECT_NSEQ(@YES, ExecuteJavaScript(@"__gCrWeb.hasPasswordFieldTestOnly()"));
   const std::string base_url = BaseUrl();
   PasswordFormFillData form_data;
   SetPasswordFormFillData(form_data, base_url, base_url, "u0", "test_user",
                           "p0", "test_password", nullptr, nullptr, false);
   __block BOOL block_was_called = NO;
   __block BOOL return_value = NO;
   [passwordController_ fillPasswordForm:form_data
                       completionHandler:^(BOOL success) {
                         block_was_called = YES;
                         return_value = success;
@@ skipping 373 matching lines @@
 // Tests that an HTTPS page with a password field does not update the SSL status
 // to indicate DISPLAYED_PASSWORD_FIELD_ON_HTTP.
 TEST_F(PasswordControllerTest, HTTPSPassword) {
   LoadHtml(kHtmlWithPasswordForm, GURL("https://chromium.test"));
 
   web::SSLStatus ssl_status =
       web_state()->GetNavigationManager()->GetLastCommittedItem()->GetSSL();
   EXPECT_FALSE(ssl_status.content_status &
                web::SSLStatus::DISPLAYED_PASSWORD_FIELD_ON_HTTP);
 }