Merge pull request #35 from brave/update-patches-c64

Update bitrot patches for c-64

patches/chrome-browser-android-omnibox-autocomplete_controller_android.cc.patch

@@ -1,12 +1,19 @@
 diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
-index 61c41d19e2fbf7c43bbf5ce9afb5ece667bfadb9..4270226c3150119ee8ea8d000e64649424bbb012 100644
+index 3dfce1f5113531fdabdf4f0bce4a1920e7e23719..999dcb9ce87f7be8a931ca6dbd81f16be86f4768 100644
 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc
 +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc
-@@ -56,6 +56,8 @@
- #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+@@ -17,6 +17,7 @@
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/time/time.h"
+ #include "base/timer/timer.h"
++#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
+ #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
+ #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
+ #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
+@@ -56,6 +57,7 @@
+ #include "third_party/metrics_proto/omnibox_event.pb.h"
  #include "ui/base/device_form_factor.h"
 
-+#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
 +
  using base::android::AttachCurrentThread;
  using base::android::ConvertJavaStringToUTF16;
@@ -29,7 +36,7 @@ index 61c41d19e2fbf7c43bbf5ce9afb5ece667bfadb9..4270226c3150119ee8ea8d000e646494
            base::WrapUnique(new ChromeAutocompleteProviderClient(profile)),
            this,
            AutocompleteClassifier::DefaultOmniboxProviders())),
-@@ -344,7 +346,7 @@ AutocompleteControllerAndroid::Factory::~Factory() {
+@@ -347,7 +349,7 @@ AutocompleteControllerAndroid::Factory::~Factory() {
 
  KeyedService* AutocompleteControllerAndroid::Factory::BuildServiceInstanceFor(
      content::BrowserContext* profile) const {

patches/chrome-browser-autocomplete-autocomplete_classifier_factory.cc.patch

@@ -1,22 +1,21 @@
 diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
-index 546f574bd2d3577413f2d13cfa058bf90c3c77bf..eb4364774a6f53e718d860e7ff533d6b666a86d0 100644
+index 0d758c8be1626f34ff44cce85e287d5f8027395e..b0bcb1918d65c67163cc2084a898c2db460db161 100644
 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
 +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc
-@@ -23,6 +23,8 @@
- #include "extensions/browser/extensions_browser_client.h"
- #endif
+@@ -5,6 +5,7 @@
+ #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
 
+ #include "base/memory/ptr_util.h"
 +#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-+
- // static
- AutocompleteClassifier* AutocompleteClassifierFactory::GetForProfile(
-     Profile* profile) {
-@@ -40,7 +42,7 @@ std::unique_ptr<KeyedService> AutocompleteClassifierFactory::BuildInstanceFor(
-     content::BrowserContext* context) {
+ #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
+ #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
+ #include "chrome/browser/autocomplete/contextual_suggestions_service_factory.h"
+@@ -41,7 +42,7 @@ std::unique_ptr<KeyedService> AutocompleteClassifierFactory::BuildInstanceFor(
    Profile* profile = static_cast<Profile*>(context);
+   auto provider_client =
+       base::MakeUnique<ChromeAutocompleteProviderClient>(profile);
+-  auto controller = base::WrapUnique(new AutocompleteController(
++  auto controller = base::WrapUnique(new BraveAutocompleteController(
+       std::move(provider_client), NULL,
+       AutocompleteClassifier::DefaultOmniboxProviders()));
    return base::MakeUnique<AutocompleteClassifier>(
--      base::WrapUnique(new AutocompleteController(
-+      base::WrapUnique(new BraveAutocompleteController(
-           base::WrapUnique(new ChromeAutocompleteProviderClient(profile)), NULL,
-           AutocompleteClassifier::DefaultOmniboxProviders())),
-       std::unique_ptr<AutocompleteSchemeClassifier>(

patches/chrome-browser-ui-app_list-search-omnibox_provider.cc.patch

@@ -1,16 +1,16 @@
 diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc
-index fbf7b26028ebd2a1d764c3494387ac1373be8b1f..c09de3e559f5833ef5a10b41dd61a7daced2b07a 100644
+index 9dfb228e1d71345580601bc4897e8d53faee8540..1cc62cd28ab50c6ac3a61a815cabc227c06a92e7 100644
 --- a/chrome/browser/ui/app_list/search/omnibox_provider.cc
 +++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc
-@@ -18,13 +18,15 @@
- #include "ui/app_list/search_result.h"
- #include "url/gurl.h"
+@@ -6,6 +6,7 @@
 
+ #include "ash/app_list/model/search_result.h"
+ #include "base/memory/ptr_util.h"
 +#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-+
- namespace app_list {
-
- OmniboxProvider::OmniboxProvider(Profile* profile,
+ #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
+ #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
+ #include "chrome/browser/profiles/profile.h"
+@@ -24,7 +25,7 @@ OmniboxProvider::OmniboxProvider(Profile* profile,
                                   AppListControllerDelegate* list_controller)
      : profile_(profile),
        list_controller_(list_controller),

patches/chrome-browser-ui-views-frame-test_with_browser_view.cc.patch

@@ -1,8 +1,8 @@
 diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc
-index 9ac0dfe768c298ad160f476e6ac0a06ea9c55af9..9d007454e65e840eef137e68054c4f9266756a4e 100644
+index c179d20c088c28a9b3b4ac02d844b61b9633f833..5551e45af87fbc6c387463ccdb23d6d0bf47cbbf 100644
 --- a/chrome/browser/ui/views/frame/test_with_browser_view.cc
 +++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc
-@@ -52,7 +52,7 @@ std::unique_ptr<KeyedService> CreateAutocompleteClassifier(
+@@ -51,7 +51,7 @@ std::unique_ptr<KeyedService> CreateAutocompleteClassifier(
      content::BrowserContext* context) {
    Profile* profile = static_cast<Profile*>(context);
    return base::MakeUnique<AutocompleteClassifier>(

patches/chrome-browser-ui-webui-omnibox-omnibox_page_handler.cc.patch

@@ -1,17 +1,16 @@
 diff --git a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
-index 66dc8e32404e169cb40cd5a56cbfe166d9709dbe..028a37bad232a5f1691e5e6d20b4932399ccd866 100644
+index 91690a5762cbebb8ca1cd307207ec938be3f51d3..01d4b72b129ca1cacb4f391044ac539e5c508cdd 100644
 --- a/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
 +++ b/chrome/browser/ui/webui/omnibox/omnibox_page_handler.cc
-@@ -34,6 +34,8 @@
- #include "components/search_engines/template_url.h"
- #include "content/public/browser/web_ui.h"
-
+@@ -16,6 +16,7 @@
+ #include "base/strings/utf_string_conversions.h"
+ #include "base/time/time.h"
+ #include "base/values.h"
 +#include "brave/components/omnibox/browser/brave_autocomplete_controller.h"
-+
- using bookmarks::BookmarkModel;
-
- namespace mojo {
-@@ -209,7 +211,7 @@ void OmniboxPageHandler::StartOmniboxQuery(const std::string& input_string,
+ #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
+ #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
+ #include "chrome/browser/bookmarks/bookmark_model_factory.h"
+@@ -210,7 +211,7 @@ void OmniboxPageHandler::StartOmniboxQuery(const std::string& input_string,
  }
 
  void OmniboxPageHandler::ResetController() {

patches/components-omnibox-browser-autocomplete_controller.h.patch

@@ -1,8 +1,8 @@
 diff --git a/components/omnibox/browser/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h
-index 4cf270f246961ad1507b00e5e557b6b62e6bc227..3d90d66078c5da78f0f875a1b643c53d703dcb50 100644
+index 22016d948671a1db266a501201c75fbd619a56ac..60d630dd7a7d46b169133ff59f2206bdcf8ca749 100644
 --- a/components/omnibox/browser/autocomplete_controller.h
 +++ b/components/omnibox/browser/autocomplete_controller.h
-@@ -139,6 +139,7 @@ class AutocompleteController : public AutocompleteProviderListener {
+@@ -140,6 +140,7 @@ class AutocompleteController : public AutocompleteProviderListener {
    }
 
   private: