Inject suggestion_controller.js with chrome js bundle.

Frame messaging enables autofill to work in iframes. |suggestion_controller.js|
needs to also be injected into all frames in order use the JSSuggestionManager
APIs. (Such as navigating to the previous and next form items.)

Bug: None
Cq-Include-Trybots: luci.chromium.try:ios-simulator-cronet;luci.chromium.try:ios-simulator-full-configs
Change-Id: I69c47b8245cca136e200a0129f6bb79e093aa630
Reviewed-on: https://chromium-review.googlesource.com/1239372
Commit-Queue: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593831}

components/autofill/ios/browser/BUILD.gn

@@ -35,7 +35,6 @@ source_set("browser") {
   ]
 
   deps = [
-    ":injected_js",
     "//base",
     "//components/autofill/core/browser",
     "//components/autofill/core/common",
@@ -72,13 +71,6 @@ source_set("test_support") {
   ]
 }
 
-js_compile_checked("injected_js") {
-  visibility = [ ":browser" ]
-  sources = [
-    "resources/suggestion_controller.js",
-  ]
-}
-
 source_set("unit_tests") {
   testonly = true
   configs += [ "//build/config/compiler:enable_arc" ]

components/autofill/ios/browser/js_suggestion_manager.h

@@ -5,13 +5,17 @@
 #ifndef COMPONENTS_AUTOFILL_IOS_BROWSER_JS_SUGGESTION_MANAGER_H_
 #define COMPONENTS_AUTOFILL_IOS_BROWSER_JS_SUGGESTION_MANAGER_H_
 
-#import "ios/web/public/web_state/js/crw_js_injection_manager.h"
-
-@class CRWJSInjectionReceiver;
+#import "ios/web/public/web_state/js/crw_js_injection_receiver.h"
 
 // Loads the JavaScript file, suggestion_manager.js, which contains form parsing
 // and autofill functions.
-@interface JsSuggestionManager : CRWJSInjectionManager
+@interface JsSuggestionManager : NSObject
+
+// Designated initializer. |receiver| should not be nil.
+- (instancetype)initWithReceiver:(CRWJSInjectionReceiver*)receiver
+    NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)init NS_UNAVAILABLE;
 
 // Focuses the next focusable element in tab order. No action if there is no
 // such element.

components/autofill/ios/browser/js_suggestion_manager.mm

@@ -22,15 +22,23 @@ NSString* JSONEscape(NSString* str) {
 }
 }  // namespace
 
-@implementation JsSuggestionManager
+@implementation JsSuggestionManager {
+  // The injection receiver used to evaluate JavaScript.
+  CRWJSInjectionReceiver* _receiver;
+}
+
+- (instancetype)initWithReceiver:(CRWJSInjectionReceiver*)receiver {
+  DCHECK(receiver);
+  self = [super init];
+  if (self) {
+    _receiver = receiver;
+  }
+  return self;
+}
 
 #pragma mark -
 #pragma mark ProtectedMethods
 
-- (NSString*)scriptPath {
-  return @"suggestion_controller";
-}
-
 - (void)selectNextElement {
   [self selectElementAfterForm:@"" field:@""];
 }
@@ -39,7 +47,7 @@ NSString* JSONEscape(NSString* str) {
   NSString* selectNextElementJS = [NSString
       stringWithFormat:@"__gCrWeb.suggestion.selectNextElement(%@, %@)",
                        JSONEscape(formName), JSONEscape(fieldName)];
-  [self executeJavaScript:selectNextElementJS completionHandler:nil];
+  [_receiver executeJavaScript:selectNextElementJS completionHandler:nil];
 }
 
 - (void)selectPreviousElement {
@@ -50,7 +58,7 @@ NSString* JSONEscape(NSString* str) {
   NSString* selectPreviousElementJS = [NSString
       stringWithFormat:@"__gCrWeb.suggestion.selectPreviousElement(%@, %@)",
                        JSONEscape(formName), JSONEscape(fieldName)];
-  [self executeJavaScript:selectPreviousElementJS completionHandler:nil];
+  [_receiver executeJavaScript:selectPreviousElementJS completionHandler:nil];
 }
 
 - (void)fetchPreviousAndNextElementsPresenceWithCompletionHandler:
@@ -65,7 +73,6 @@ NSString* JSONEscape(NSString* str) {
                                   completionHandler:
                                       (void (^)(BOOL, BOOL))completionHandler {
   DCHECK(completionHandler);
-  DCHECK([self hasBeenInjected]);
   NSString* escapedFormName = JSONEscape(formName);
   NSString* escapedFieldName = JSONEscape(fieldName);
   NSString* JS = [NSString
@@ -74,33 +81,35 @@ NSString* JSONEscape(NSString* str) {
                        @".toString()",
                        escapedFormName, escapedFieldName, escapedFormName,
                        escapedFieldName];
-  [self executeJavaScript:JS completionHandler:^(id result, NSError* error) {
-    // The result maybe an empty string here due to 2 reasons:
-    // 1) When there is an exception running the JS
-    // 2) There is a race when the page is changing due to which
-    // JSSuggestionManager has not yet injected __gCrWeb.suggestion object
-    // Handle this case gracefully.
-    // If a page has overridden Array.toString, the string returned may not
-    // contain a ",", hence this is a defensive measure to early return.
-    NSArray* components = [result componentsSeparatedByString:@","];
-    if (components.count != 2) {
-      completionHandler(NO, NO);
-      return;
-    }
-
-    DCHECK([components[0] isEqualToString:@"true"] ||
-           [components[0] isEqualToString:@"false"]);
-    BOOL hasPreviousElement = [components[0] isEqualToString:@"true"];
-    DCHECK([components[1] isEqualToString:@"true"] ||
-           [components[1] isEqualToString:@"false"]);
-    BOOL hasNextElement = [components[1] isEqualToString:@"true"];
-    completionHandler(hasPreviousElement, hasNextElement);
-  }];
+  [_receiver executeJavaScript:JS
+             completionHandler:^(id result, NSError* error) {
+               // The result maybe an empty string here due to 2 reasons:
+               // 1) When there is an exception running the JS
+               // 2) There is a race when the page is changing due to which
+               // JSSuggestionManager has not yet injected __gCrWeb.suggestion
+               // object Handle this case gracefully. If a page has overridden
+               // Array.toString, the string returned may not contain a ",",
+               // hence this is a defensive measure to early return.
+               NSArray* components = [result componentsSeparatedByString:@","];
+               if (components.count != 2) {
+                 completionHandler(NO, NO);
+                 return;
+               }
+
+               DCHECK([components[0] isEqualToString:@"true"] ||
+                      [components[0] isEqualToString:@"false"]);
+               BOOL hasPreviousElement =
+                   [components[0] isEqualToString:@"true"];
+               DCHECK([components[1] isEqualToString:@"true"] ||
+                      [components[1] isEqualToString:@"false"]);
+               BOOL hasNextElement = [components[1] isEqualToString:@"true"];
+               completionHandler(hasPreviousElement, hasNextElement);
+             }];
 }
 
 - (void)closeKeyboard {
-  [self executeJavaScript:@"document.activeElement.blur()"
-        completionHandler:nil];
+  [_receiver executeJavaScript:@"document.activeElement.blur()"
+             completionHandler:nil];
 }
 
 @end

components/autofill/ios/browser/resources/suggestion_controller.js

@@ -9,6 +9,7 @@
  * TODO(crbug.com/647084): Enable checkTypes error for this file.
  * @suppress {checkTypes}
  */
+goog.provide('__crWeb.suggestion');
 
 /* Beginning of anonymous object. */
 (function() {

ios/chrome/browser/autofill/form_suggestion_controller.mm

@@ -169,17 +169,6 @@ AutofillSuggestionState::AutofillSuggestionState(
 
 - (void)processPage:(web::WebState*)webState {
   [self resetSuggestionState];
-
-  web::URLVerificationTrustLevel trustLevel =
-      web::URLVerificationTrustLevel::kNone;
-  const GURL pageURL(webState->GetCurrentURL(&trustLevel));
-  if (trustLevel != web::URLVerificationTrustLevel::kAbsolute) {
-    DLOG(WARNING) << "Page load not handled on untrusted page";
-    return;
-  }
-
-  if (web::UrlHasWebScheme(pageURL) && webState->ContentIsHTML())
-    [_jsSuggestionManager inject];
 }
 
 - (void)setWebViewProxy:(id<CRWWebViewProxy>)webViewProxy {

ios/chrome/browser/web/BUILD.gn

@@ -133,6 +133,7 @@ js_compile_bundle("chrome_bundle_all_frames") {
   closure_entry_point = "__crWeb.chromeBundleAllFrames"
   sources = [
     "//components/autofill/ios/browser/resources/autofill_controller.js",
+    "//components/autofill/ios/browser/resources/suggestion_controller.js",
     "//components/autofill/ios/form_util/resources/fill.js",
     "//components/autofill/ios/form_util/resources/form.js",
     "//components/autofill/ios/form_util/resources/form_handlers.js",

ios/chrome/browser/web/resources/chrome_bundle_all_frames.js

@@ -11,3 +11,4 @@ goog.require('__crWeb.fill');
 goog.require('__crWeb.form');
 goog.require('__crWeb.formHandlers');
 goog.require('__crWeb.print');
+goog.require('__crWeb.suggestion');

ios/web_view/BUILD.gn

@@ -424,6 +424,7 @@ js_compile_bundle("web_view_bundle") {
   closure_entry_point = "__crWeb.webViewBundle"
   sources = [
     "//components/autofill/ios/browser/resources/autofill_controller.js",
+    "//components/autofill/ios/browser/resources/suggestion_controller.js",
     "//components/autofill/ios/form_util/resources/fill.js",
     "//components/autofill/ios/form_util/resources/form.js",
     "//components/autofill/ios/form_util/resources/form_handlers.js",

ios/web_view/internal/autofill/cwv_autofill_controller.mm

@@ -376,8 +376,6 @@ showUnmaskPromptForCard:(const autofill::CreditCard&)creditCard
                     inFrame:(web::WebFrame*)frame {
   DCHECK_EQ(_webState, webState);
 
-  [_JSSuggestionManager inject];
-
   NSString* nsFormName = base::SysUTF8ToNSString(params.form_name);
   NSString* nsFieldName = base::SysUTF8ToNSString(params.field_name);
   NSString* nsFieldIdentifier =

ios/web_view/resources/web_view_bundle.js

@@ -10,3 +10,4 @@ goog.require('__crWeb.fill');
 goog.require('__crWeb.form');
 goog.require('__crWeb.formHandlers');
 goog.require('__crWeb.passwords');
+goog.require('__crWeb.suggestion');