Make browsing_data component a layered component

chrome/browser/browsing_data/cache_counter_browsertest.cc

 // Copyright (c) 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Note that this file only tests the basic behavior of the cache counter, as in
 // when it counts and when not, when result is nonzero and when not. It does not
 // test whether the result of the counting is correct. This is the
 // responsibility of a lower layer, and is tested in
 // DiskCacheBackendTest.CalculateSizeOfAllEntries in net_unittests.
 
 #include "chrome/browser/browsing_data/cache_counter.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/browsing_data/browsing_data_utils.h"
-#include "components/browsing_data/pref_names.h"
-#include "components/browsing_data/storage_partition_http_cache_data_remover.h"
+#include "components/browsing_data/content/storage_partition_http_cache_data_remover.h"
+#include "components/browsing_data/core/browsing_data_utils.h"
+#include "components/browsing_data/core/pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
@@ skipping 249 matching lines @@
   SetDeletionPeriodPref(browsing_data::FOUR_WEEKS);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 
   SetDeletionPeriodPref(browsing_data::EVERYTHING);
   WaitForIOThread();
   EXPECT_EQ(result, GetResult());
 }
 
 }  // namespace