Move browsing_data_helper files into a separate directory.

BUG=121862 TEST=existing unit_tests TBR=eroman@chromium.org,sky@chromium.org,erg@chromium.org Review URL: https://chromiumcodereview.appspot.com/10805015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147504 0039d316-1c4b-4281-b951-d872f2087c98
author: markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-07-19 19:22:47 +0000
committer: markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2012-07-19 19:22:47 +0000
commit: b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8 (patch)
tree: 15a6587d385b54fe41e83b724747eb0d2dc4388e
parent: 3cbacdcbc6765a739ca5a1edf13c2dd20be13bf1 (diff)
download: chromium_src-b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8.zip
chromium_src-b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8.tar.gz
chromium_src-b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8.tar.bz2
90 files changed, 299 insertions, 295 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index f4d6d70..b2ea3ff 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -35,8 +35,8 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/net/url_request_mock_util.h"
diff --git a/chrome/browser/automation/automation_provider_observers.h b/chrome/browser/automation/automation_provider_observers.h
index 3c607a9..8e1d904 100644
--- a/chrome/browser/automation/automation_provider_observers.h
+++ b/chrome/browser/automation/automation_provider_observers.h
@@ -23,7 +23,7 @@
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.h"
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 7dafdc2..2dcee1a 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -42,8 +42,8 @@
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_prefs.h"
diff --git a/chrome/browser/browsing_data/OWNERS b/chrome/browser/browsing_data/OWNERS
new file mode 100644
index 0000000..227c668
--- /dev/null
+++ b/chrome/browser/browsing_data/OWNERS
@@ -0,0 +1,4 @@
+markusheintz@chromium.org
+mkwst@chromium.org
+bauerb@chromim.org
+michaeln@chromium.org
diff --git a/chrome/browser/browsing_data_appcache_helper.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
index 8a823cf..50a62e3 100644
--- a/chrome/browser/browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
diff --git a/chrome/browser/browsing_data_appcache_helper.h b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
index 5004d93..3b17fbb 100644
--- a/chrome/browser/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_APPCACHE_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_APPCACHE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_APPCACHE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_APPCACHE_HELPER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ -90,4 +90,4 @@ class CannedBrowsingDataAppCacheHelper : public BrowsingDataAppCacheHelper {
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataAppCacheHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_APPCACHE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_APPCACHE_HELPER_H_
diff --git a/chrome/browser/browsing_data_appcache_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
index cafe50e..b138ac7 100644
--- a/chrome/browser/browsing_data_appcache_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_appcache_helper_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
diff --git a/chrome/browser/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
index 57a3076..0e261e1 100644
--- a/chrome/browser/browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 
 #include "utility"
 
diff --git a/chrome/browser/browsing_data_cookie_helper.h b/chrome/browser/browsing_data/browsing_data_cookie_helper.h
index aa87fd0..ad724056 100644
--- a/chrome/browser/browsing_data_cookie_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_COOKIE_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_COOKIE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_
 
 #include <map>
 #include <string>
@@ -144,4 +144,4 @@ class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataCookieHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_COOKIE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_COOKIE_HELPER_H_
diff --git a/chrome/browser/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
index a3c5af9..d5fc256 100644
--- a/chrome/browser/browsing_data_cookie_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_cookie_helper_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 
 
 #include "base/bind.h"
diff --git a/chrome/browser/browsing_data_database_helper.cc b/chrome/browser/browsing_data/browsing_data_database_helper.cc
index c08baa8..32b7c51 100644
--- a/chrome/browser/browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/completion_callback.h"
diff --git a/chrome/browser/browsing_data_database_helper.h b/chrome/browser/browsing_data/browsing_data_database_helper.h
index 14bec5e..a822bd9 100644
--- a/chrome/browser/browsing_data_database_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_database_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_DATABASE_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_DATABASE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
 
 #include <list>
 #include <set>
@@ -164,4 +164,4 @@ class CannedBrowsingDataDatabaseHelper : public BrowsingDataDatabaseHelper {
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataDatabaseHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_DATABASE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_DATABASE_HELPER_H_
diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
index eacbc11..80017b5 100644
--- a/chrome/browser/browsing_data_database_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -6,8 +6,8 @@
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_helper_browsertest.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/browsing_data_database_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_database_helper_unittest.cc
index f5b79e1..2a2b474 100644
--- a/chrome/browser/browsing_data_database_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_database_helper_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
index 2f4e2ed..c1bd432 100644
--- a/chrome/browser/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ -11,7 +11,7 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/fileapi/file_system_context.h"
diff --git a/chrome/browser/browsing_data_file_system_helper.h b/chrome/browser/browsing_data/browsing_data_file_system_helper.h
index f4571ce..89d685c 100644
--- a/chrome/browser/browsing_data_file_system_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
 
 #include <list>
 #include <string>
@@ -175,4 +175,4 @@ class CannedBrowsingDataFileSystemHelper
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataFileSystemHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
diff --git a/chrome/browser/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
index 3ffcb3b..d60e8f2 100644
--- a/chrome/browser/browsing_data_file_system_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/platform_file.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "webkit/fileapi/file_system_context.h"
diff --git a/chrome/browser/browsing_data_helper.cc b/chrome/browser/browsing_data/browsing_data_helper.cc
index 8e586d8..18cdaa1 100644
--- a/chrome/browser/browsing_data_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/browsing_data_helper.h b/chrome/browser/browsing_data/browsing_data_helper.h
index 81ef4fb..65afbcc 100644
--- a/chrome/browser/browsing_data_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_helper.h
@@ -4,8 +4,8 @@
 
 // Defines methods relevant to all code that wants to work with browsing data.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_H_
 
 #include <string>
 
@@ -50,4 +50,4 @@ class BrowsingDataHelper {
   DISALLOW_IMPLICIT_CONSTRUCTORS(BrowsingDataHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_H_
diff --git a/chrome/browser/browsing_data_helper_browsertest.h b/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
index 883ed6e..1f953e3 100644
--- a/chrome/browser/browsing_data_helper_browsertest.h
+++ b/chrome/browser/browsing_data/browsing_data_helper_browsertest.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 // Contains code shared by all browsing data browsertests.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_HELPER_BROWSERTEST_H_
-#define CHROME_BROWSER_BROWSING_DATA_HELPER_BROWSERTEST_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_
 
 #include <list>
 
@@ -42,4 +42,4 @@ class BrowsingDataHelperCallback {
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataHelperCallback);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_HELPER_BROWSERTEST_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_HELPER_BROWSERTEST_H_
diff --git a/chrome/browser/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
index 5151b44..d3eab5d 100644
--- a/chrome/browser/browsing_data_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/mock_extension_special_storage_policy.h"
diff --git a/chrome/browser/browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.cc
index 99958cd..823c4878 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -12,7 +12,7 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/indexed_db_context.h"
diff --git a/chrome/browser/browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
index f3c1fdc..de0504c 100644
--- a/chrome/browser/browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_INDEXED_DB_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_INDEXED_DB_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_INDEXED_DB_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_INDEXED_DB_HELPER_H_
 
 #include <list>
 #include <set>
@@ -142,4 +142,4 @@ class CannedBrowsingDataIndexedDBHelper
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataIndexedDBHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_INDEXED_DB_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_INDEXED_DB_HELPER_H_
diff --git a/chrome/browser/browsing_data_indexed_db_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
index 1aa01ea..da2288f 100644
--- a/chrome/browser/browsing_data_indexed_db_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -11,8 +11,8 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_helper_browsertest.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper_browsertest.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/browsing_data_indexed_db_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc
index 0d1fd76..b2f5118 100644
--- a/chrome/browser/browsing_data_indexed_db_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc
@@ -5,7 +5,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/test/base/testing_profile.h"
 
 namespace {
diff --git a/chrome/browser/browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
index 7e476b0..820f63f 100644
--- a/chrome/browser/browsing_data_local_storage_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/dom_storage_context.h"
diff --git a/chrome/browser/browsing_data_local_storage_helper.h b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h
index c8979ad..4acd3cb 100644
--- a/chrome/browser/browsing_data_local_storage_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
 
 #include <list>
 #include <set>
@@ -114,4 +114,4 @@ class CannedBrowsingDataLocalStorageHelper
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataLocalStorageHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
diff --git a/chrome/browser/browsing_data_local_storage_helper_browsertest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
index 4af8242..8fb9a10 100644
--- a/chrome/browser/browsing_data_local_storage_helper_browsertest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc
@@ -14,8 +14,8 @@
 #include "base/test/thread_test_helper.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_helper_browsertest.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper_browsertest.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
diff --git a/chrome/browser/browsing_data_local_storage_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_local_storage_helper_unittest.cc
index 64a7f93..2ad644a 100644
--- a/chrome/browser/browsing_data_local_storage_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_local_storage_helper_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/browsing_data_quota_helper.cc b/chrome/browser/browsing_data/browsing_data_quota_helper.cc
index b872c2f..2b06311 100644
--- a/chrome/browser/browsing_data_quota_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#include "chrome/browser/browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
 
 BrowsingDataQuotaHelper::QuotaInfo::QuotaInfo()
     : temporary_usage(0),
diff --git a/chrome/browser/browsing_data_quota_helper.h b/chrome/browser/browsing_data/browsing_data_quota_helper.h
index d6ac8331..192379e 100644
--- a/chrome/browser/browsing_data_quota_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_QUOTA_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_QUOTA_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_H_
 
 #include <list>
 #include <string>
@@ -78,4 +78,4 @@ class BrowsingDataQuotaHelper
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataQuotaHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_QUOTA_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_H_
diff --git a/chrome/browser/browsing_data_quota_helper_impl.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc
index 0995b2d..b00268d5 100644
--- a/chrome/browser/browsing_data_quota_helper_impl.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_quota_helper_impl.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper_impl.h"
 
 #include <map>
 #include <set>
@@ -11,7 +11,7 @@
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "webkit/quota/quota_manager.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/browsing_data_quota_helper_impl.h b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h
index 832e93e..93680b5 100644
--- a/chrome/browser/browsing_data_quota_helper_impl.h
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
-#define CHROME_BROWSER_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
 
 #include <map>
 #include <set>
@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
-#include "chrome/browser/browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/quota/quota_types.h"
 
@@ -74,4 +74,4 @@ class BrowsingDataQuotaHelperImpl : public BrowsingDataQuotaHelper {
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataQuotaHelperImpl);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_QUOTA_HELPER_IMPL_H_
diff --git a/chrome/browser/browsing_data_quota_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
index 71931ad..3d3b971 100644
--- a/chrome/browser/browsing_data_quota_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/message_loop_proxy.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
-#include "chrome/browser/browsing_data_quota_helper_impl.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper_impl.h"
 #include "content/public/test/test_browser_thread.h"
 #include "webkit/quota/mock_storage_client.h"
 #include "webkit/quota/quota_manager.h"
diff --git a/chrome/browser/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc
index 01347ee..dc99dc7 100644
--- a/chrome/browser/browsing_data_remover.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <map>
 #include <set>
@@ -16,7 +16,7 @@
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data/browsing_data_remover.h
index 439ca15..330bafd 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data/browsing_data_remover.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
-#define CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
 
 #include <set>
 
@@ -364,4 +364,4 @@ class BrowsingDataRemover : public content::NotificationObserver,
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemover);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_REMOVER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_REMOVER_H_
diff --git a/chrome/browser/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
index 522a4245..594a6ab 100644
--- a/chrome/browser/browsing_data_remover_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include <set>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/message_loop.h"
 #include "base/platform_file.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/extensions/mock_extension_special_storage_policy.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
diff --git a/chrome/browser/browsing_data_server_bound_cert_helper.cc b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc
index dc56bb3..2b0111a 100644
--- a/chrome/browser/browsing_data_server_bound_cert_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
diff --git a/chrome/browser/browsing_data_server_bound_cert_helper.h b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h
index 3d8e2b9..a90c3da 100644
--- a/chrome/browser/browsing_data_server_bound_cert_helper.h
+++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
-#define CHROME_BROWSER_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
 
 #include <map>
 #include <string>
@@ -88,4 +88,4 @@ class CannedBrowsingDataServerBoundCertHelper
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataServerBoundCertHelper);
 };
 
-#endif  // CHROME_BROWSER_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
diff --git a/chrome/browser/browsing_data_server_bound_cert_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc
index 8abd4a2..b1fd4bf 100644
--- a/chrome/browser/browsing_data_server_bound_cert_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
diff --git a/chrome/browser/local_data_container.cc b/chrome/browser/browsing_data/local_data_container.cc
index 89d749c..d3d76a9 100644
--- a/chrome/browser/local_data_container.cc
+++ b/chrome/browser/browsing_data/local_data_container.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/local_data_container.h"
+#include "chrome/browser/browsing_data/local_data_container.h"
 
 #include "base/bind.h"
 #include "base/memory/linked_ptr.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "net/cookies/canonical_cookie.h"
diff --git a/chrome/browser/local_data_container.h b/chrome/browser/browsing_data/local_data_container.h
index 6e71190..67edf7c 100644
--- a/chrome/browser/local_data_container.h
+++ b/chrome/browser/browsing_data/local_data_container.h
@@ -2,20 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_LOCAL_DATA_CONTAINER_H_
-#define CHROME_BROWSER_LOCAL_DATA_CONTAINER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_LOCAL_DATA_CONTAINER_H_
+#define CHROME_BROWSER_BROWSING_DATA_LOCAL_DATA_CONTAINER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_quota_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "net/base/server_bound_cert_store.h"
 
 class LocalDataContainer;
@@ -138,4 +138,4 @@ class LocalDataContainer {
   DISALLOW_COPY_AND_ASSIGN(LocalDataContainer);
 };
 
-#endif  // CHROME_BROWSER_LOCAL_DATA_CONTAINER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_LOCAL_DATA_CONTAINER_H_
diff --git a/chrome/browser/mock_browsing_data_appcache_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.cc
index 2c124b1..52f87d3 100644
--- a/chrome/browser/mock_browsing_data_appcache_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mock_browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
 
 #include "base/callback.h"
 
diff --git a/chrome/browser/mock_browsing_data_appcache_helper.h b/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h
index 6de3f46..6306ba9 100644
--- a/chrome/browser/mock_browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_
 
 #include "base/callback_forward.h"
-#include "chrome/browser/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 
 class MockBrowsingDataAppCacheHelper
     : public BrowsingDataAppCacheHelper {
@@ -20,4 +20,4 @@ class MockBrowsingDataAppCacheHelper
   virtual ~MockBrowsingDataAppCacheHelper();
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_APPCACHE_HELPER_H_
diff --git a/chrome/browser/mock_browsing_data_cookie_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
index 4d7085f..b8511e0 100644
--- a/chrome/browser/mock_browsing_data_cookie_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mock_browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
 
 #include "base/logging.h"
 #include "net/cookies/canonical_cookie.h"
diff --git a/chrome/browser/mock_browsing_data_cookie_helper.h b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h
index dc10238..7fef2a6 100644
--- a/chrome/browser/mock_browsing_data_cookie_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_COOKIE_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_COOKIE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_COOKIE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_COOKIE_HELPER_H_
 
 #include <map>
 #include <string>
 
-#include "chrome/browser/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "net/cookies/canonical_cookie.h"
 
 // Mock for BrowsingDataCookieHelper.
@@ -46,4 +46,4 @@ class MockBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
   std::map<const std::string, bool> cookies_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_COOKIE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_COOKIE_HELPER_H_
diff --git a/chrome/browser/mock_browsing_data_database_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_database_helper.cc
index bedb19a..b6fbdb5 100644
--- a/chrome/browser/mock_browsing_data_database_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_database_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mock_browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
 
 #include "base/callback.h"
 
diff --git a/chrome/browser/mock_browsing_data_database_helper.h b/chrome/browser/browsing_data/mock_browsing_data_database_helper.h
index 10c465e..9e6ea9f 100644
--- a/chrome/browser/mock_browsing_data_database_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_database_helper.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_DATABASE_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_DATABASE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_DATABASE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_DATABASE_HELPER_H_
 
 #include <list>
 #include <map>
 
 #include "base/callback.h"
-#include "chrome/browser/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 
 // Mock for BrowsingDataDatabaseHelper.
 // Use AddDatabaseSamples() or add directly to response_ list, then call
@@ -53,4 +53,4 @@ class MockBrowsingDataDatabaseHelper : public BrowsingDataDatabaseHelper {
   std::list<DatabaseInfo> response_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_DATABASE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_DATABASE_HELPER_H_
diff --git a/chrome/browser/mock_browsing_data_file_system_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.cc
index 49932b1..1e637bc 100644
--- a/chrome/browser/mock_browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.cc
@@ -4,7 +4,7 @@
 
 #include "base/callback.h"
 #include "base/logging.h"
-#include "chrome/browser/mock_browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h"
 
 MockBrowsingDataFileSystemHelper::MockBrowsingDataFileSystemHelper(
     Profile* profile) {
diff --git a/chrome/browser/mock_browsing_data_file_system_helper.h b/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h
index 51949a1..2349019 100644
--- a/chrome/browser/mock_browsing_data_file_system_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
 
 #include <list>
 #include <map>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 
 // Mock for BrowsingDataFileSystemHelper.
 // Use AddFileSystemSamples() or add directly to response_ list, then call
@@ -55,4 +55,4 @@ class MockBrowsingDataFileSystemHelper : public BrowsingDataFileSystemHelper {
   std::list<FileSystemInfo> response_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_FILE_SYSTEM_HELPER_H_
diff --git a/chrome/browser/mock_browsing_data_indexed_db_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.cc
index 3cc77c9..a44e02c 100644
--- a/chrome/browser/mock_browsing_data_indexed_db_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mock_browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
diff --git a/chrome/browser/mock_browsing_data_indexed_db_helper.h b/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h
index 34a0426..c24e1cb 100644
--- a/chrome/browser/mock_browsing_data_indexed_db_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_INDEXED_DB_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_INDEXED_DB_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_INDEXED_DB_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_INDEXED_DB_HELPER_H_
 
 #include <list>
 #include <map>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 
 // Mock for BrowsingDataIndexedDBHelper.
 // Use AddIndexedDBSamples() or add directly to response_ list, then
@@ -47,4 +47,4 @@ class MockBrowsingDataIndexedDBHelper
   std::list<IndexedDBInfo> response_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_INDEXED_DB_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_INDEXED_DB_HELPER_H_
diff --git a/chrome/browser/mock_browsing_data_local_storage_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.cc
index ea2a098..cf9cd28 100644
--- a/chrome/browser/mock_browsing_data_local_storage_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mock_browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
diff --git a/chrome/browser/mock_browsing_data_local_storage_helper.h b/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h
index 6f0495a..e72901ea 100644
--- a/chrome/browser/mock_browsing_data_local_storage_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
 
 #include <list>
 #include <map>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 
 // Mock for BrowsingDataLocalStorageHelper.
 // Use AddLocalStorageSamples() or add directly to response_ list, then
@@ -51,4 +51,4 @@ class MockBrowsingDataLocalStorageHelper
   std::list<LocalStorageInfo> response_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_LOCAL_STORAGE_HELPER_H_
diff --git a/chrome/browser/mock_browsing_data_quota_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc
index 5dd50b1..6ff8518 100644
--- a/chrome/browser/mock_browsing_data_quota_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mock_browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
 
 using content::BrowserThread;
 
diff --git a/chrome/browser/mock_browsing_data_quota_helper.h b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.h
index 3495d84..21f4570 100644
--- a/chrome/browser/mock_browsing_data_quota_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_quota_helper.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
 
 #include <list>
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
 
 class MockBrowsingDataQuotaHelper : public BrowsingDataQuotaHelper {
  public:
@@ -31,4 +31,4 @@ class MockBrowsingDataQuotaHelper : public BrowsingDataQuotaHelper {
   std::list<QuotaInfo> response_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_QUOTA_HELPER_H_
diff --git a/chrome/browser/mock_browsing_data_server_bound_cert_helper.cc b/chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_helper.cc
index 63b063f..6cb78ed 100644
--- a/chrome/browser/mock_browsing_data_server_bound_cert_helper.cc
+++ b/chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_helper.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/mock_browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h"
 
 #include "base/logging.h"
 
diff --git a/chrome/browser/mock_browsing_data_server_bound_cert_helper.h b/chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h
index fd693b1..33edee3 100644
--- a/chrome/browser/mock_browsing_data_server_bound_cert_helper.h
+++ b/chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MOCK_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
-#define CHROME_BROWSER_MOCK_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
+#ifndef CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
+#define CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
 
 #include <map>
 #include <string>
 
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 
 // Mock for BrowsingDataServerBoundCertHelper.
 class MockBrowsingDataServerBoundCertHelper
@@ -44,4 +44,4 @@ class MockBrowsingDataServerBoundCertHelper
   std::map<const std::string, bool> server_bound_certs_;
 };
 
-#endif  // CHROME_BROWSER_MOCK_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
+#endif  // CHROME_BROWSER_BROWSING_DATA_MOCK_BROWSING_DATA_SERVER_BOUND_CERT_HELPER_H_
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 8245f4b..55c4172 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -15,8 +15,8 @@
 #include "chrome/app/breakpad_mac.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/chrome_benchmarking_message_filter.h"
 #include "chrome/browser/chrome_quota_permission_context.h"
diff --git a/chrome/browser/content_settings/local_shared_objects_container.cc b/chrome/browser/content_settings/local_shared_objects_container.cc
index fd47677..b7c6921 100644
--- a/chrome/browser/content_settings/local_shared_objects_container.cc
+++ b/chrome/browser/content_settings/local_shared_objects_container.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 02d356d..e08a581 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -9,12 +9,12 @@
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index 835856d..85a975a 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -12,8 +12,8 @@
 #include "base/memory/linked_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h
index 9e8b0c09..2140308 100644
--- a/chrome/browser/cookies_tree_model.h
+++ b/chrome/browser/cookies_tree_model.h
@@ -17,13 +17,13 @@
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_quota_helper.h"
-#include "chrome/browser/local_data_container.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/local_data_container.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "net/base/server_bound_cert_store.h"
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index 9e047c7..037692a 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -11,14 +11,14 @@
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
-#include "chrome/browser/mock_browsing_data_appcache_helper.h"
-#include "chrome/browser/mock_browsing_data_cookie_helper.h"
-#include "chrome/browser/mock_browsing_data_database_helper.h"
-#include "chrome/browser/mock_browsing_data_file_system_helper.h"
-#include "chrome/browser/mock_browsing_data_indexed_db_helper.h"
-#include "chrome/browser/mock_browsing_data_local_storage_helper.h"
-#include "chrome/browser/mock_browsing_data_quota_helper.h"
-#include "chrome/browser/mock_browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
index 71ec96e..7a3315b 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.cc
@@ -11,8 +11,8 @@
 #include <string>
 
 #include "base/values.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/plugin_data_remover_helper.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h
index 3cea6ff..59074fa 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_api.h
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_api.h
@@ -11,7 +11,7 @@
 
 #include <string>
 
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/extensions/extension_function.h"
 
 class PluginPrefs;
diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
index 1d39a5d..4561e02 100644
--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc
@@ -11,8 +11,8 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index cecb6c9..8135197 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -11,8 +11,8 @@
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc
index 5fdb3c1..14c1957 100644
--- a/chrome/browser/ui/browser_commands.cc
+++ b/chrome/browser/ui/browser_commands.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/chrome_page_zoom.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/download/download_util.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index 016c1cc7..3df5a83 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -9,13 +9,13 @@
 #include "base/mac/bundle_locations.h"
 #import "base/mac/mac_util.h"
 #include "base/sys_string_conversions.h"
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.h b/chrome/browser/ui/cocoa/content_settings/cookie_details.h
index 836bff1..489ce30 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookie_details.h
+++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.h
@@ -5,9 +5,9 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "webkit/appcache/appcache_service.h"
 
 class CookieTreeNode;
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index 302e3b1..9199b0c 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -5,19 +5,19 @@
 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
 
 #include <string>
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/local_data_container.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
-#include "chrome/browser/local_data_container.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
diff --git a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h
index 2f72490..d55a8ee 100644
--- a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h
+++ b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h
@@ -9,10 +9,10 @@
 
 #include <string>
 
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 
 class GURL;
 
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index fa3da03..7f9e2ee 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/browser/ui/views/collected_cookies_views.h"
 
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
diff --git a/chrome/browser/ui/views/indexed_db_info_view.h b/chrome/browser/ui/views/indexed_db_info_view.h
index f6fc5df..22c134d 100644
--- a/chrome/browser/ui/views/indexed_db_info_view.h
+++ b/chrome/browser/ui/views/indexed_db_info_view.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_INDEXED_DB_INFO_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_INDEXED_DB_INFO_VIEW_H_
 
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "ui/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/ui/views/local_storage_info_view.h b/chrome/browser/ui/views/local_storage_info_view.h
index 3624a4d..06c801e 100644
--- a/chrome/browser/ui/views/local_storage_info_view.h
+++ b/chrome/browser/ui/views/local_storage_info_view.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_
 
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "ui/views/view.h"
 
 namespace views {
diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
index 7d3cbdf..91bfc11 100644
--- a/chrome/browser/ui/website_settings/website_settings.cc
+++ b/chrome/browser/ui/website_settings/website_settings.cc
@@ -13,12 +13,12 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
index fb32972..53a11f9 100644
--- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc
@@ -10,8 +10,8 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/net/gaia/gaia_oauth_fetcher.h"
 #include "chrome/browser/policy/auto_enrollment_client.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h
index 258863c..fb8146e 100644
--- a/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h
@@ -11,7 +11,7 @@
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen_actor.h"
 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index c81fd0d..a59cc41 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -14,8 +14,8 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros_settings.h"
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
index 6f630db..d278147 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h
@@ -9,7 +9,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
diff --git a/chrome/browser/ui/webui/extensions/pack_extension_handler.h b/chrome/browser/ui/webui/extensions/pack_extension_handler.h
index ec64872..c85d212 100644
--- a/chrome/browser/ui/webui/extensions/pack_extension_handler.h
+++ b/chrome/browser/ui/webui/extensions/pack_extension_handler.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/extensions/pack_extension_job.h"
 #include "chrome/browser/plugin_data_remover_helper.h"
 #include "chrome/browser/ui/select_file_dialog.h"
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 52d1c9b..5a7e1ae 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -30,8 +30,8 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/chrome_net_log.h"
diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
index da693e0..332261a 100644
--- a/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
+++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler.cc
@@ -10,8 +10,8 @@
 #include "base/string16.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browsing_data_helper.h"
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/webui/options2/clear_browser_data_handler.h b/chrome/browser/ui/webui/options2/clear_browser_data_handler.h
index 6ece636..5b6e485 100644
--- a/chrome/browser/ui/webui/options2/clear_browser_data_handler.h
+++ b/chrome/browser/ui/webui/options2/clear_browser_data_handler.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_CLEAR_BROWSER_DATA_HANDLER_H_
 
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/ui/webui/options2/options_ui.h"
 
diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler.cc b/chrome/browser/ui/webui/options2/cookies_view_handler.cc
index c1d4144..1817de1 100644
--- a/chrome/browser/ui/webui/options2/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options2/cookies_view_handler.cc
@@ -12,14 +12,14 @@
 #include "base/values.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_cookie_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
-#include "chrome/browser/browsing_data_quota_helper.h"
-#include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_quota_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
diff --git a/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc b/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc
index 663f5b2..112b75e 100644
--- a/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc
+++ b/chrome/browser/ui/webui/options2/web_intents_settings_handler.cc
@@ -7,11 +7,11 @@
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/browsing_data_appcache_helper.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_file_system_helper.h"
-#include "chrome/browser/browsing_data_indexed_db_helper.h"
-#include "chrome/browser/browsing_data_local_storage_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_database_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
+#include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ea0834b..ea63a8c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -343,28 +343,30 @@
         'browser/browser_trial.h',
         'browser/browser_util_win.cc',
         'browser/browser_util_win.h',
-        'browser/browsing_data_appcache_helper.cc',
-        'browser/browsing_data_appcache_helper.h',
-        'browser/browsing_data_cookie_helper.cc',
-        'browser/browsing_data_cookie_helper.h',
-        'browser/browsing_data_database_helper.cc',
-        'browser/browsing_data_database_helper.h',
-        'browser/browsing_data_file_system_helper.cc',
-        'browser/browsing_data_file_system_helper.h',
-        'browser/browsing_data_helper.cc',
-        'browser/browsing_data_helper.h',
-        'browser/browsing_data_indexed_db_helper.cc',
-        'browser/browsing_data_indexed_db_helper.h',
-        'browser/browsing_data_local_storage_helper.cc',
-        'browser/browsing_data_local_storage_helper.h',
-        'browser/browsing_data_quota_helper.cc',
-        'browser/browsing_data_quota_helper.h',
-        'browser/browsing_data_quota_helper_impl.cc',
-        'browser/browsing_data_quota_helper_impl.h',
-        'browser/browsing_data_remover.cc',
-        'browser/browsing_data_remover.h',
-        'browser/browsing_data_server_bound_cert_helper.cc',
-        'browser/browsing_data_server_bound_cert_helper.h',
+        'browser/browsing_data/browsing_data_appcache_helper.cc',
+        'browser/browsing_data/browsing_data_appcache_helper.h',
+        'browser/browsing_data/browsing_data_database_helper.cc',
+        'browser/browsing_data/browsing_data_database_helper.h',
+        'browser/browsing_data/browsing_data_file_system_helper.cc',
+        'browser/browsing_data/browsing_data_file_system_helper.h',
+        'browser/browsing_data/browsing_data_helper.cc',
+        'browser/browsing_data/browsing_data_helper.h',
+        'browser/browsing_data/browsing_data_indexed_db_helper.cc',
+        'browser/browsing_data/browsing_data_indexed_db_helper.h',
+        'browser/browsing_data/browsing_data_local_storage_helper.cc',
+        'browser/browsing_data/browsing_data_local_storage_helper.h',
+        'browser/browsing_data/local_data_container.cc',
+        'browser/browsing_data/local_data_container.h',
+        'browser/browsing_data/browsing_data_quota_helper.cc',
+        'browser/browsing_data/browsing_data_quota_helper.h',
+        'browser/browsing_data/browsing_data_quota_helper_impl.cc',
+        'browser/browsing_data/browsing_data_quota_helper_impl.h',
+        'browser/browsing_data/browsing_data_remover.cc',
+        'browser/browsing_data/browsing_data_remover.h',
+        'browser/browsing_data/browsing_data_server_bound_cert_helper.cc',
+        'browser/browsing_data/browsing_data_server_bound_cert_helper.h',
+        'browser/browsing_data/browsing_data_cookie_helper.cc',
+        'browser/browsing_data/browsing_data_cookie_helper.h',
         'browser/feedback/feedback_data.cc',
         'browser/feedback/feedback_data.h',
         'browser/feedback/feedback_util.cc',
@@ -1362,8 +1364,6 @@
         'browser/lifetime/application_lifetime_mac.mm',
         'browser/lifetime/application_lifetime_stub.cc',
         'browser/lifetime/application_lifetime_win.cc',
-        'browser/local_data_container.cc',
-        'browser/local_data_container.h',
         'browser/mac/dock.h',
         'browser/mac/dock.mm',
         'browser/mac/install_from_dmg.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9f9eee2..eb1aec5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -123,22 +123,22 @@
         'browser/extensions/test_extension_system.h',
         'browser/extensions/test_management_policy.cc',
         'browser/extensions/test_management_policy.h',
-        'browser/mock_browsing_data_appcache_helper.cc',
-        'browser/mock_browsing_data_appcache_helper.h',
-        'browser/mock_browsing_data_cookie_helper.cc',
-        'browser/mock_browsing_data_cookie_helper.h',
-        'browser/mock_browsing_data_database_helper.cc',
-        'browser/mock_browsing_data_database_helper.h',
-        'browser/mock_browsing_data_file_system_helper.cc',
-        'browser/mock_browsing_data_file_system_helper.h',
-        'browser/mock_browsing_data_indexed_db_helper.cc',
-        'browser/mock_browsing_data_indexed_db_helper.h',
-        'browser/mock_browsing_data_local_storage_helper.cc',
-        'browser/mock_browsing_data_local_storage_helper.h',
-        'browser/mock_browsing_data_quota_helper.cc',
-        'browser/mock_browsing_data_quota_helper.h',
-        'browser/mock_browsing_data_server_bound_cert_helper.cc',
-        'browser/mock_browsing_data_server_bound_cert_helper.h',
+        'browser/browsing_data/mock_browsing_data_cookie_helper.cc',
+        'browser/browsing_data/mock_browsing_data_cookie_helper.h',
+        'browser/browsing_data/mock_browsing_data_appcache_helper.cc',
+        'browser/browsing_data/mock_browsing_data_appcache_helper.h',
+        'browser/browsing_data/mock_browsing_data_database_helper.cc',
+        'browser/browsing_data/mock_browsing_data_database_helper.h',
+        'browser/browsing_data/mock_browsing_data_file_system_helper.cc',
+        'browser/browsing_data/mock_browsing_data_file_system_helper.h',
+        'browser/browsing_data/mock_browsing_data_indexed_db_helper.cc',
+        'browser/browsing_data/mock_browsing_data_indexed_db_helper.h',
+        'browser/browsing_data/mock_browsing_data_local_storage_helper.cc',
+        'browser/browsing_data/mock_browsing_data_local_storage_helper.h',
+        'browser/browsing_data/mock_browsing_data_quota_helper.cc',
+        'browser/browsing_data/mock_browsing_data_quota_helper.h',
+        'browser/browsing_data/mock_browsing_data_server_bound_cert_helper.cc',
+        'browser/browsing_data/mock_browsing_data_server_bound_cert_helper.h',
         'browser/net/url_request_mock_link_doctor_job.cc',
         'browser/net/url_request_mock_link_doctor_job.h',
         'browser/net/url_request_mock_util.cc',
@@ -1066,16 +1066,16 @@
         'browser/bookmarks/recently_used_folders_combo_model_unittest.cc',
         'browser/browser_about_handler_unittest.cc',
         'browser/browser_commands_unittest.cc',
-        'browser/browsing_data_appcache_helper_unittest.cc',
-        'browser/browsing_data_cookie_helper_unittest.cc',
-        'browser/browsing_data_database_helper_unittest.cc',
-        'browser/browsing_data_file_system_helper_unittest.cc',
-        'browser/browsing_data_helper_unittest.cc',
-        'browser/browsing_data_indexed_db_helper_unittest.cc',
-        'browser/browsing_data_local_storage_helper_unittest.cc',
-        'browser/browsing_data_quota_helper_unittest.cc',
-        'browser/browsing_data_remover_unittest.cc',
-        'browser/browsing_data_server_bound_cert_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_appcache_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_cookie_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_database_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_file_system_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_indexed_db_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_local_storage_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_quota_helper_unittest.cc',
+        'browser/browsing_data/browsing_data_remover_unittest.cc',
+        'browser/browsing_data/browsing_data_server_bound_cert_helper_unittest.cc',
         'browser/captive_portal/captive_portal_service_unittest.cc',
         'browser/captive_portal/captive_portal_tab_helper_unittest.cc',
         'browser/captive_portal/captive_portal_tab_reloader_unittest.cc',
@@ -2657,10 +2657,10 @@
         'browser/bookmarks/bookmark_extension_apitest.cc',
         'browser/bookmarks/bookmark_manager_extension_apitest.cc',
         'browser/browser_encoding_browsertest.cc',
-        'browser/browsing_data_database_helper_browsertest.cc',
-        'browser/browsing_data_helper_browsertest.h',
-        'browser/browsing_data_indexed_db_helper_browsertest.cc',
-        'browser/browsing_data_local_storage_helper_browsertest.cc',
+        'browser/browsing_data/browsing_data_database_helper_browsertest.cc',
+        'browser/browsing_data/browsing_data_helper_browsertest.h',
+        'browser/browsing_data/browsing_data_indexed_db_helper_browsertest.cc',
+        'browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc',
         'browser/captive_portal/captive_portal_browsertest.cc',
         'browser/chrome_main_browsertest.cc',
         'browser/chrome_switches_browsertest.cc',
diff --git a/chrome_frame/delete_chrome_history.cc b/chrome_frame/delete_chrome_history.cc
index 5f05fec..f2333f4 100644
--- a/chrome_frame/delete_chrome_history.cc
+++ b/chrome_frame/delete_chrome_history.cc
@@ -5,7 +5,7 @@
 // Implementation of DeleteChromeHistory
 #include "chrome_frame/delete_chrome_history.h"
 
-#include "chrome/browser/browsing_data_remover.h"
+#include "chrome/browser/browsing_data/browsing_data_remover.h"
 
 #include "base/win/windows_version.h"
 #include "chrome_frame/chrome_frame_activex.h"
author	markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-07-19 19:22:47 +0000
committer	markusheintz@chromium.org <markusheintz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2012-07-19 19:22:47 +0000
commit	b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8 (patch)
tree	15a6587d385b54fe41e83b724747eb0d2dc4388e
parent	3cbacdcbc6765a739ca5a1edf13c2dd20be13bf1 (diff)
download	chromium_src-b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8.zip chromium_src-b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8.tar.gz chromium_src-b0cb5e82de3a8195c91aecdac90bcd8fcc77bdd8.tar.bz2