Merge pull request #20415 from brave/cr118-followup-fix-autofill-clie…

…nt-crash

Fix autofill related crash due to our disabling of optimization hints

chromium_src/chrome/browser/ui/autofill/chrome_autofill_client.cc

@@ -4,11 +4,13 @@
 // You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "chrome/browser/ui/autofill/chrome_autofill_client.h"
+
 #include "base/memory/ptr_util.h"
 #include "brave/components/constants/pref_names.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/payments/webauthn_dialog_controller_impl.h"
 #include "chrome/browser/ui/page_info/page_info_dialog.h"
+#include "components/optimization_guide/core/optimization_guide_features.h"
 #include "mojo/public/cpp/bindings/associated_receiver.h"
 
 namespace autofill {
@@ -34,6 +36,13 @@ class BraveChromeAutofillClient : public ChromeAutofillClient {
  public:
   using ChromeAutofillClient::ChromeAutofillClient;
 
+  AutofillOptimizationGuide* GetAutofillOptimizationGuide() const override {
+    if (optimization_guide::features::IsOptimizationHintsEnabled()) {
+      return ChromeAutofillClient::GetAutofillOptimizationGuide();
+    }
+    return nullptr;
+  }
+
   bool IsAutocompleteEnabled() const override {
     auto enabled = ChromeAutofillClient::IsAutocompleteEnabled();
     if (!IsPrivateProfile(web_contents())) {