From b48cea969c402ff1650c9d4dde1ad7bd34288002 Mon Sep 17 00:00:00 2001 From: joedow Date: Fri, 29 Jan 2016 16:58:31 -0800 Subject: 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} --- components/BUILD.gn | 1 - 1 file changed, 1 deletion(-) (limited to 'components/BUILD.gn') diff --git a/components/BUILD.gn b/components/BUILD.gn index 0a6c5bf..ad3fab2 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -63,7 +63,6 @@ test("components_unittests") { "//components/network_time:unit_tests", "//components/open_from_clipboard:unit_tests", "//components/os_crypt:unit_tests", - "//components/prefs:unit_tests", "//components/proxy_config:unit_tests", "//components/security_state:unit_tests", "//components/sessions:unit_tests", -- cgit v1.1