diff options
| author | joedow <joedow@chromium.org> | 2016-01-29 16:58:31 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-30 00:59:29 +0000 |
| commit | b48cea969c402ff1650c9d4dde1ad7bd34288002 (patch) | |
| tree | 35a4e52c658408650e8e49e6940da476d552a5e5 /chromeos/chromeos.gyp | |
| parent | c125e4b1653f84976ef9b611b58d69425ad7a8cb (diff) | |
| download | chromium_src-b48cea969c402ff1650c9d4dde1ad7bd34288002.zip chromium_src-b48cea969c402ff1650c9d4dde1ad7bd34288002.tar.gz chromium_src-b48cea969c402ff1650c9d4dde1ad7bd34288002.tar.bz2 | |
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=
Review URL: https://codereview.chromium.org/1645073005
Cr-Commit-Position: refs/heads/master@{#372499}
Diffstat (limited to 'chromeos/chromeos.gyp')
| -rw-r--r-- | chromeos/chromeos.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp index c0f9ab5..2aeeec8 100644 --- a/chromeos/chromeos.gyp +++ b/chromeos/chromeos.gyp @@ -511,6 +511,7 @@ 'dependencies': [ '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../base/base.gyp:base_prefs', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../build/linux/system.gyp:dbus', '../build/linux/system.gyp:ssl', @@ -519,7 +520,6 @@ '../components/components.gyp:onc_component', '../components/components.gyp:proxy_config', '../components/components.gyp:signin_core_account_id', - '../components/prefs/prefs.gyp:prefs', '../crypto/crypto.gyp:crypto', '../dbus/dbus.gyp:dbus', '../google_apis/google_apis.gyp:google_apis', @@ -644,13 +644,13 @@ 'target_name': 'chromeos_unittests', 'type': 'executable', 'dependencies': [ + '../base/base.gyp:base_prefs_test_support', '../base/base.gyp:run_all_unittests', '../base/base.gyp:test_support_base', '../build/linux/system.gyp:dbus', '../build/linux/system.gyp:ssl', '../components/components.gyp:onc_component', '../components/components.gyp:proxy_config', - '../components/prefs/prefs.gyp:prefs_test_support', '../crypto/crypto.gyp:crypto', '../crypto/crypto.gyp:crypto_test_support', '../dbus/dbus.gyp:dbus_test_support', |