BASELINE: Update Chromium to 65.0.3325.151

Change-Id: I3c71dd500483eb29491ac3eee4123714dda52da9
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 8 insertions, 2 deletions

diff --git a/chromium/components/autofill/content/renderer/password_autofill_agent.cc b/chromium/components/autofill/content/renderer/password_autofill_agent.cc
index b8f64d41912..daa25e605b0 100644
--- a/chromium/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/chromium/components/autofill/content/renderer/password_autofill_agent.cc
@@ -1543,15 +1543,18 @@ std::unique_ptr<PasswordForm> PasswordAutofillAgent::GetPasswordFormFromWebForm(
 
 std::unique_ptr<PasswordForm>
 PasswordAutofillAgent::GetPasswordFormFromUnownedInputElements() {
-  blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
   // The element's frame might have been detached in the meantime (see
   // http://crbug.com/585363, comments 5 and 6), in which case |frame| will
   // be null. This was hardly caused by form submission (unless the user is
   // supernaturally quick), so it is OK to drop the ball here.
+  content::RenderFrame* frame = render_frame();
   if (!frame)
     return nullptr;
+  blink::WebLocalFrame* web_frame = frame->GetWebFrame();
+  if (!web_frame)
+    return nullptr;
   return CreatePasswordFormFromUnownedInputElements(
-      *frame, &field_value_and_properties_map_, &form_predictions_,
+      *web_frame, &field_value_and_properties_map_, &form_predictions_,
       &username_detector_cache_);
 }
 
diff --git a/chromium/components/autofill/ios/browser/autofill_agent.mm b/chromium/components/autofill/ios/browser/autofill_agent.mm
index a4ca360894a..53851ff4097 100644
--- a/chromium/components/autofill/ios/browser/autofill_agent.mm
+++ b/chromium/components/autofill/ios/browser/autofill_agent.mm
@@ -427,6 +427,9 @@ void GetFormAndField(autofill::FormData* form,
       return NO;
     }
 
+    // main_frame_origin is used for logging UKM.
+    form.main_frame_origin = url::Origin::Create(pageURL);
+
     // Action is optional.
     base::string16 action;
     formData->GetString("action", &action);