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/sync_sessions | |
| 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/sync_sessions')
| -rw-r--r-- | chromium/components/sync_sessions/PRESUBMIT.py | 7 | ||||
| -rw-r--r-- | chromium/components/sync_sessions/sessions_global_id_mapper.cc | 21 |
2 files changed, 2 insertions, 26 deletions
diff --git a/chromium/components/sync_sessions/PRESUBMIT.py b/chromium/components/sync_sessions/PRESUBMIT.py index e4ed67530db..3768c7d79f8 100644 --- a/chromium/components/sync_sessions/PRESUBMIT.py +++ b/chromium/components/sync_sessions/PRESUBMIT.py @@ -12,16 +12,11 @@ import re SYNC_SESSIONS_SOURCE_FILES = (r'^components[\\/]sync_sessions[\\/].*\.(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=SYNC_SESSIONS_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/sync_sessions/sessions_global_id_mapper.cc b/chromium/components/sync_sessions/sessions_global_id_mapper.cc index 573e4be9d63..0b8a101a61d 100644 --- a/chromium/components/sync_sessions/sessions_global_id_mapper.cc +++ b/chromium/components/sync_sessions/sessions_global_id_mapper.cc @@ -6,7 +6,6 @@ #include <utility> -#include "base/metrics/histogram_macros.h" #include "base/stl_util.h" namespace sync_sessions { @@ -18,14 +17,6 @@ const size_t kNavigationTrackingCleanupThreshold = 100; // When we clean up navigation tracking, delete this many global_ids. const int kNavigationTrackingCleanupAmount = 10; -// Used to record conflict information into histogram Sync.GlobalIdConflict. -enum SyncGlobalIdConflict { - CONFLICT = 0, - NO_CONFLICT_NEW_ID, - NO_CONFLICT_SAME_IDS, - CONFLICT_MAX, -}; - } // namespace SessionsGlobalIdMapper::SessionsGlobalIdMapper() = default; @@ -64,17 +55,7 @@ void SessionsGlobalIdMapper::TrackNavigationId(const base::Time& timestamp, DCHECK_NE(0, unique_id); - auto g2u_iter = global_to_unique_.find(global_id); - if (g2u_iter == global_to_unique_.end()) { - global_to_unique_.insert(g2u_iter, std::make_pair(global_id, unique_id)); - UMA_HISTOGRAM_ENUMERATION("Sync.GlobalIdConflict", NO_CONFLICT_NEW_ID, - CONFLICT_MAX); - } else if (g2u_iter->second != unique_id) { - UMA_HISTOGRAM_ENUMERATION("Sync.GlobalIdConflict", CONFLICT, CONFLICT_MAX); - } else { - UMA_HISTOGRAM_ENUMERATION("Sync.GlobalIdConflict", NO_CONFLICT_SAME_IDS, - CONFLICT_MAX); - } + global_to_unique_.emplace(global_id, unique_id); auto u2g_iter = unique_to_current_global_.find(unique_id); if (u2g_iter == unique_to_current_global_.end()) { |