|
Revert of Move base/prefs to components/prefs (patchset #7 id:120001 of https://codereview.chromium.org/1648403002/ )
Reason for revert:
Reverting due to failure on iOS builder:
https://build.chromium.org/p/chromium.mac/builders/iOS_Device_%28ninja%29/builds/38425/steps/steps/logs/stdio
Original issue's description:
> Move base/prefs to components/prefs
>
> This change is the minimal move change. It does not update namespaces or includes. Forwarding headers and targets exist to map to the new location. The namespaces, include guards, and references to these files will be updated in follow-ups.
>
> The GYP build has been updated to point to the new location because the forwarding headers generated a .gyp file cycle. Avoiding a cycle with libaddressinput is why prefs is a separate .gyp from most of the rest of the components. The GN build uses forwarding targets to keep the change smaller.
>
> The json pref store unit tests had to be updated because of the way that they used histograms conflicted with the hsitogram setup of the components unittests. Fortunately, there's a HistogramTester helper for this case, so this patch uses it in for the moved test in place of manually checking histogram counts.
>
> json_pref_store_unittests.cc also depended on the files il base/test/data/prefs. Rather than worry about updating all the isolates and such, this just adds the data inline and avoids having separate test files.
>
> BUG=
>
> Committed: https://crrev.com/deb824cd36c02a93854537d70e1853cb9f1c55b9
> Cr-Commit-Position: refs/heads/master@{#372494}
TBR=jam@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
Committed: https://crrev.com/b48cea969c402ff1650c9d4dde1ad7bd34288002
Cr-Commit-Position: refs/heads/master@{#372499}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+9275 lines, -9474 lines) |
Patch |
|
M |
base/BUILD.gn
|
View
|
|
3 chunks |
+86 lines, -9 lines |
0 comments
|
Download
|
|
M |
base/base.gyp
|
View
|
|
3 chunks |
+89 lines, -0 lines |
0 comments
|
Download
|
|
D |
base/prefs/DEPS
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
|
A |
base/prefs/OWNERS
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/README
|
View
|
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/base_prefs_export.h
|
View
|
|
1 chunk |
+25 lines, -3 lines |
0 comments
|
Download
|
|
M |
base/prefs/default_pref_store.h
|
View
|
|
1 chunk |
+49 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/default_pref_store.cc
|
View
|
|
1 chunk |
+56 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/default_pref_store_unittest.cc
|
View
|
|
1 chunk |
+70 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/json_pref_store.h
|
View
|
|
1 chunk |
+225 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/json_pref_store.cc
|
View
|
|
1 chunk |
+537 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/json_pref_store_unittest.cc
|
View
|
|
1 chunk |
+965 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/mock_pref_change_callback.h
|
View
|
|
1 chunk |
+47 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/mock_pref_change_callback.cc
|
View
|
|
1 chunk |
+24 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/overlay_user_pref_store.h
|
View
|
|
1 chunk |
+85 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/overlay_user_pref_store.cc
|
View
|
|
1 chunk |
+186 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/overlay_user_pref_store_unittest.cc
|
View
|
|
1 chunk |
+292 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/persistent_pref_store.h
|
View
|
|
1 chunk |
+73 lines, -3 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_change_registrar.h
|
View
|
|
1 chunk |
+77 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_change_registrar.cc
|
View
|
|
1 chunk |
+94 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_change_registrar_unittest.cc
|
View
|
|
1 chunk |
+198 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_filter.h
|
View
|
|
1 chunk |
+51 lines, -3 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_member.h
|
View
|
|
1 chunk |
+352 lines, -4 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_member.cc
|
View
|
|
1 chunk |
+223 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_member_unittest.cc
|
View
|
|
1 chunk |
+325 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_notifier.h
|
View
|
|
1 chunk |
+22 lines, -3 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_notifier_impl.h
|
View
|
|
1 chunk |
+70 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_notifier_impl.cc
|
View
|
|
1 chunk |
+117 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_notifier_impl_unittest.cc
|
View
|
|
1 chunk |
+222 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_observer.h
|
View
|
|
1 chunk |
+17 lines, -3 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_registry.h
|
View
|
|
1 chunk |
+85 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_registry.cc
|
View
|
|
1 chunk |
+67 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_registry_simple.h
|
View
|
|
1 chunk |
+87 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_registry_simple.cc
|
View
|
|
1 chunk |
+160 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_service.h
|
View
|
|
1 chunk |
+381 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_service.cc
|
View
|
|
1 chunk |
+616 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_service_factory.h
|
View
|
|
1 chunk |
+87 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_service_factory.cc
|
View
|
|
1 chunk |
+65 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_service_unittest.cc
|
View
|
|
1 chunk |
+430 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_store.h
|
View
|
|
1 chunk |
+59 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_store.cc
|
View
|
|
1 chunk |
+13 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_store_observer_mock.h
|
View
|
|
1 chunk |
+31 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_store_observer_mock.cc
|
View
|
|
1 chunk |
+29 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_value_map.h
|
View
|
|
1 chunk |
+87 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_value_map.cc
|
View
|
|
1 chunk |
+144 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_value_map_unittest.cc
|
View
|
|
1 chunk |
+135 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/pref_value_store.h
|
View
|
|
1 chunk |
+256 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_value_store.cc
|
View
|
|
1 chunk |
+290 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/pref_value_store_unittest.cc
|
View
|
|
1 chunk |
+670 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/scoped_user_pref_update.h
|
View
|
|
1 chunk |
+104 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/scoped_user_pref_update.cc
|
View
|
|
1 chunk |
+37 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/prefs/scoped_user_pref_update_unittest.cc
|
View
|
|
1 chunk |
+81 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/testing_pref_service.h
|
View
|
|
1 chunk |
+192 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/testing_pref_service.cc
|
View
|
|
1 chunk |
+54 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/testing_pref_store.h
|
View
|
|
1 chunk |
+110 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/testing_pref_store.cc
|
View
|
|
1 chunk |
+181 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/value_map_pref_store.h
|
View
|
|
1 chunk |
+53 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/prefs/value_map_pref_store.cc
|
View
|
|
1 chunk |
+64 lines, -0 lines |
0 comments
|
Download
|
|
M |
base/prefs/writeable_pref_store.h
|
View
|
|
1 chunk |
+68 lines, -3 lines |
0 comments
|
Download
|
|
A |
base/test/data/prefs/invalid.json
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
A |
base/test/data/prefs/read.json
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
|
A |
base/test/data/prefs/write.golden.json
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
chrome/chrome_common.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chrome/chrome_tests_unit.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
chromeos/chromeos.gyp
|
View
|
|
3 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
components/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -1 line |
0 comments
|
Download
|
|
M |
components/autofill.gypi
|
View
|
|
6 chunks |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
components/components_tests.gyp
|
View
|
|
4 chunks |
+1 line, -15 lines |
0 comments
|
Download
|
|
M |
components/content_settings.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/dom_distiller.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/domain_reliability.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/flags_ui.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/history.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/invalidation.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/keyed_service.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/metrics.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/policy/policy_browser.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/policy/policy_common.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/pref_registry.gypi
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
D |
components/prefs/BUILD.gn
|
View
|
|
1 chunk |
+0 lines, -106 lines |
0 comments
|
Download
|
|
D |
components/prefs/OWNERS
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
|
D |
components/prefs/base_prefs_export.h
|
View
|
|
1 chunk |
+0 lines, -29 lines |
0 comments
|
Download
|
|
D |
components/prefs/default_pref_store.h
|
View
|
|
1 chunk |
+0 lines, -53 lines |
0 comments
|
Download
|
|
D |
components/prefs/default_pref_store.cc
|
View
|
|
1 chunk |
+0 lines, -56 lines |
0 comments
|
Download
|
|
D |
components/prefs/default_pref_store_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -70 lines |
0 comments
|
Download
|
|
D |
components/prefs/json_pref_store.h
|
View
|
|
1 chunk |
+0 lines, -229 lines |
0 comments
|
Download
|
|
D |
components/prefs/json_pref_store.cc
|
View
|
|
1 chunk |
+0 lines, -537 lines |
0 comments
|
Download
|
|
D |
components/prefs/json_pref_store_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -962 lines |
0 comments
|
Download
|
|
D |
components/prefs/mock_pref_change_callback.h
|
View
|
|
1 chunk |
+0 lines, -51 lines |
0 comments
|
Download
|
|
D |
components/prefs/mock_pref_change_callback.cc
|
View
|
|
1 chunk |
+0 lines, -24 lines |
0 comments
|
Download
|
|
D |
components/prefs/overlay_user_pref_store.h
|
View
|
|
1 chunk |
+0 lines, -89 lines |
0 comments
|
Download
|
|
D |
components/prefs/overlay_user_pref_store.cc
|
View
|
|
1 chunk |
+0 lines, -186 lines |
0 comments
|
Download
|
|
D |
components/prefs/overlay_user_pref_store_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -292 lines |
0 comments
|
Download
|
|
D |
components/prefs/persistent_pref_store.h
|
View
|
|
1 chunk |
+0 lines, -77 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_change_registrar.h
|
View
|
|
1 chunk |
+0 lines, -81 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_change_registrar.cc
|
View
|
|
1 chunk |
+0 lines, -94 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_change_registrar_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -198 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_filter.h
|
View
|
|
1 chunk |
+0 lines, -55 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_member.h
|
View
|
|
1 chunk |
+0 lines, -355 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_member.cc
|
View
|
|
1 chunk |
+0 lines, -223 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_member_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -325 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_notifier.h
|
View
|
|
1 chunk |
+0 lines, -26 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_notifier_impl.h
|
View
|
|
1 chunk |
+0 lines, -74 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_notifier_impl.cc
|
View
|
|
1 chunk |
+0 lines, -117 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_notifier_impl_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -222 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_observer.h
|
View
|
|
1 chunk |
+0 lines, -21 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_registry.h
|
View
|
|
1 chunk |
+0 lines, -89 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_registry.cc
|
View
|
|
1 chunk |
+0 lines, -67 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_registry_simple.h
|
View
|
|
1 chunk |
+0 lines, -91 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_registry_simple.cc
|
View
|
|
1 chunk |
+0 lines, -160 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_service.h
|
View
|
|
1 chunk |
+0 lines, -385 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_service.cc
|
View
|
|
1 chunk |
+0 lines, -616 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_service_factory.h
|
View
|
|
1 chunk |
+0 lines, -91 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_service_factory.cc
|
View
|
|
1 chunk |
+0 lines, -65 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_service_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -430 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_store.h
|
View
|
|
1 chunk |
+0 lines, -63 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_store.cc
|
View
|
|
1 chunk |
+0 lines, -13 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_store_observer_mock.h
|
View
|
|
1 chunk |
+0 lines, -35 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_store_observer_mock.cc
|
View
|
|
1 chunk |
+0 lines, -29 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_value_map.h
|
View
|
|
1 chunk |
+0 lines, -91 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_value_map.cc
|
View
|
|
1 chunk |
+0 lines, -144 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_value_map_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -135 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_value_store.h
|
View
|
|
1 chunk |
+0 lines, -260 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_value_store.cc
|
View
|
|
1 chunk |
+0 lines, -290 lines |
0 comments
|
Download
|
|
D |
components/prefs/pref_value_store_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -670 lines |
0 comments
|
Download
|
|
D |
components/prefs/prefs.gyp
|
View
|
|
1 chunk |
+0 lines, -87 lines |
0 comments
|
Download
|
|
D |
components/prefs/scoped_user_pref_update.h
|
View
|
|
1 chunk |
+0 lines, -108 lines |
0 comments
|
Download
|
|
D |
components/prefs/scoped_user_pref_update.cc
|
View
|
|
1 chunk |
+0 lines, -37 lines |
0 comments
|
Download
|
|
D |
components/prefs/scoped_user_pref_update_unittest.cc
|
View
|
|
1 chunk |
+0 lines, -81 lines |
0 comments
|
Download
|
|
D |
components/prefs/testing_pref_service.h
|
View
|
|
1 chunk |
+0 lines, -196 lines |
0 comments
|
Download
|
|
D |
components/prefs/testing_pref_service.cc
|
View
|
|
1 chunk |
+0 lines, -54 lines |
0 comments
|
Download
|
|
D |
components/prefs/testing_pref_store.h
|
View
|
|
1 chunk |
+0 lines, -114 lines |
0 comments
|
Download
|
|
D |
components/prefs/testing_pref_store.cc
|
View
|
|
1 chunk |
+0 lines, -181 lines |
0 comments
|
Download
|
|
D |
components/prefs/value_map_pref_store.h
|
View
|
|
1 chunk |
+0 lines, -57 lines |
0 comments
|
Download
|
|
D |
components/prefs/value_map_pref_store.cc
|
View
|
|
1 chunk |
+0 lines, -64 lines |
0 comments
|
Download
|
|
D |
components/prefs/writeable_pref_store.h
|
View
|
|
1 chunk |
+0 lines, -72 lines |
0 comments
|
Download
|
|
M |
components/proximity_auth.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/proxy_config.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/signin.gypi
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/ssl_config.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/startup_metric_utils.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/sync_sessions.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/syncable_prefs.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/user_manager.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/user_prefs.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
components/variations.gypi
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
components/wallpaper.gypi
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
extensions/extensions.gyp
|
View
|
|
3 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
|
M |
extensions/shell/app_shell.gyp
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
ios/chrome/ios_chrome.gyp
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
ios/chrome/ios_chrome_tests.gyp
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
|
M |
net/net.gyp
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
net/net_common.gypi
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
rlz/rlz.gyp
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
M |
third_party/libaddressinput/libaddressinput.gyp
|
View
|
|
2 chunks |
+2 lines, -2 lines |
0 comments
|
Download
|
Total messages: 6 (2 generated)
|