diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/components/browser_sync | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/browser_sync')
| -rw-r--r-- | chromium/components/browser_sync/PRESUBMIT.py | 7 | ||||
| -rw-r--r-- | chromium/components/browser_sync/browser_sync_switches.cc | 2 | ||||
| -rw-r--r-- | chromium/components/browser_sync/signin_confirmation_helper.cc | 1 |
3 files changed, 3 insertions, 7 deletions
diff --git a/chromium/components/browser_sync/PRESUBMIT.py b/chromium/components/browser_sync/PRESUBMIT.py index d072c723a89..e7128a2ab62 100644 --- a/chromium/components/browser_sync/PRESUBMIT.py +++ b/chromium/components/browser_sync/PRESUBMIT.py @@ -12,16 +12,11 @@ import re BROWSER_SYNC_SOURCE_FILES = (r'^components[\\/]browser_sync[\\/].*\.(cc|h)$',) -# The wrapper around lint that is called below disables a set of filters if the -# passed filter evaluates to false. Pass a junk filter to avoid this behavior. -LINT_FILTERS = ['+fake/filter'] - def CheckChangeLintsClean(input_api, output_api): source_filter = lambda x: input_api.FilterSourceFile( x, white_list=BROWSER_SYNC_SOURCE_FILES, black_list=None) return input_api.canned_checks.CheckChangeLintsClean( - input_api, output_api, source_filter, lint_filters=LINT_FILTERS, - verbose_level=1) + input_api, output_api, source_filter, lint_filters=[], verbose_level=1) def CheckChanges(input_api, output_api): results = [] diff --git a/chromium/components/browser_sync/browser_sync_switches.cc b/chromium/components/browser_sync/browser_sync_switches.cc index 1de91ec7fd9..7e8e3dec77c 100644 --- a/chromium/components/browser_sync/browser_sync_switches.cc +++ b/chromium/components/browser_sync/browser_sync_switches.cc @@ -26,7 +26,7 @@ const base::Feature kSyncUseSessionsUnregisterDelay{ "SyncUseSessionsUnregisterDelay", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kSyncErrorInfoBarAndroid{"SyncErrorInfoBarAndroid", - base::FEATURE_DISABLED_BY_DEFAULT}; + base::FEATURE_ENABLED_BY_DEFAULT}; #endif // defined(OS_ANDROID) } // namespace switches diff --git a/chromium/components/browser_sync/signin_confirmation_helper.cc b/chromium/components/browser_sync/signin_confirmation_helper.cc index eb5bdb8acd8..5323d335f19 100644 --- a/chromium/components/browser_sync/signin_confirmation_helper.cc +++ b/chromium/components/browser_sync/signin_confirmation_helper.cc @@ -9,6 +9,7 @@ #include "base/bind.h" #include "base/callback.h" +#include "base/logging.h" #include "base/sequenced_task_runner.h" #include "base/strings/string16.h" #include "base/threading/sequenced_task_runner_handle.h" |