Remove webkit/browser/, point everything to storage/browser/ instead

BUG=338338
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/559063002

Cr-Commit-Position: refs/heads/master@{#294258}

android_webview/DEPS

@@ -19,5 +19,5 @@ include_rules = [
   "+ui/android",
   "+ui/base",
   "+ui/gfx",
-  "+webkit",
+  "+webkit/common/gpu"
 ]

android_webview/native/DEPS

@@ -2,6 +2,7 @@ include_rules = [
   "+content/public/browser",
   "+content/public/test",
   "+media/base/android",
+  "+storage/browser/quota",
   "+storage/common/quota",
   "+ui/gfx",
   "+ui/shell_dialogs",

android_webview/native/aw_quota_manager_bridge_impl.cc

@@ -15,9 +15,9 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "jni/AwQuotaManagerBridge_jni.h"
+#include "storage/browser/quota/quota_manager.h"
 #include "storage/common/quota/quota_types.h"
 #include "url/gurl.h"
-#include "webkit/browser/quota/quota_manager.h"
 
 using base::android::AttachCurrentThread;
 using content::BrowserThread;

chrome/browser/DEPS

@@ -121,10 +121,8 @@ include_rules = [
   # webkit/. See crbug.com/146251
   # DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW!
 
-  # TODO(kinuko): Remove all other webkit/* dependencies after we cleaned
-  # up webkit/. crbug.com/239710
+  "+storage/browser",
   "+storage/common",
-  "+webkit/browser",
 
   "-chrome/browser/ui/views",
   "+chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h",

chrome/browser/browsing_data/browsing_data_database_helper.h

@@ -14,9 +14,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "chrome/common/url_constants.h"
+#include "storage/browser/database/database_tracker.h"
 #include "storage/common/database/database_identifier.h"
 #include "url/gurl.h"
-#include "webkit/browser/database/database_tracker.h"
 
 class Profile;
 

chrome/browser/browsing_data/browsing_data_file_system_helper.cc

@@ -14,9 +14,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "content/public/browser/browser_thread.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_quota_util.h"
 #include "storage/common/fileapi/file_system_types.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_quota_util.h"
 
 using content::BrowserThread;
 

chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc

@@ -15,9 +15,9 @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
 #include "storage/common/fileapi/file_system_types.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
 
 using content::BrowserContext;
 using content::BrowserThread;

chrome/browser/browsing_data/browsing_data_helper.cc

@@ -10,8 +10,8 @@
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "extensions/common/constants.h"
+#include "storage/browser/quota/special_storage_policy.h"
 #include "url/gurl.h"
-#include "webkit/browser/quota/special_storage_policy.h"
 
 // Static
 bool BrowsingDataHelper::IsWebScheme(const std::string& scheme) {

chrome/browser/browsing_data/browsing_data_quota_helper_impl.cc

@@ -15,7 +15,7 @@
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
-#include "webkit/browser/quota/quota_manager.h"
+#include "storage/browser/quota/quota_manager.h"
 
 using content::BrowserThread;
 using content::BrowserContext;

chrome/browser/browsing_data/browsing_data_quota_helper_unittest.cc

@@ -13,8 +13,8 @@
 #include "content/public/test/mock_storage_client.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
-#include "webkit/browser/quota/quota_manager.h"
-#include "webkit/browser/quota/quota_manager_proxy.h"
+#include "storage/browser/quota/quota_manager.h"
+#include "storage/browser/quota/quota_manager_proxy.h"
 
 using content::BrowserThread;
 using content::MockOriginData;

chrome/browser/browsing_data/browsing_data_remover.cc

@@ -70,9 +70,9 @@
 #include "net/ssl/channel_id_store.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "storage/browser/quota/quota_manager.h"
+#include "storage/browser/quota/special_storage_policy.h"
 #include "storage/common/quota/quota_types.h"
-#include "webkit/browser/quota/quota_manager.h"
-#include "webkit/browser/quota/special_storage_policy.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/profiles/profile_helper.h"

chrome/browser/chrome_content_browser_client.cc

@@ -124,10 +124,10 @@
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
+#include "storage/browser/fileapi/external_mount_points.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/resources/grit/ui_resources.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"

chrome/browser/chrome_content_browser_client_parts.h

@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/memory/scoped_vector.h"
-#include "webkit/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_context.h"
 
 namespace base {
 class CommandLine;

chrome/browser/chromeos/drive/drive_integration_service.cc

@@ -47,8 +47,8 @@
 #include "content/public/common/user_agent.h"
 #include "google_apis/drive/auth_service.h"
 #include "google_apis/drive/gdata_wapi_url_generator.h"
+#include "storage/browser/fileapi/external_mount_points.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
 
 using content::BrowserContext;
 using content::BrowserThread;

chrome/browser/chromeos/drive/file_change.h

@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 namespace drive {
 class ResourceEntry;

chrome/browser/chromeos/drive/file_system_util.cc

@@ -39,7 +39,7 @@
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/escape.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 

chrome/browser/chromeos/drive/file_system_util_unittest.cc

@@ -16,12 +16,12 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_file_system_options.h"
 #include "google_apis/drive/test_util.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/isolated_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/fileapi/isolated_context.h"
 
 namespace drive {
 namespace util {

chrome/browser/chromeos/drive/file_task_executor.cc

@@ -19,7 +19,7 @@
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 using storage::FileSystemURL;
 

chrome/browser/chromeos/drive/file_task_executor_unittest.cc

@@ -13,8 +13,8 @@
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
+#include "storage/browser/fileapi/file_system_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/browser/fileapi/file_system_url.h"
 
 namespace drive {
 

chrome/browser/chromeos/drive/fileapi/async_file_util.cc

@@ -13,9 +13,9 @@
 #include "chrome/browser/chromeos/drive/fileapi/fileapi_worker.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/task_util.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
 #include "storage/common/blob/shareable_file_reference.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 

chrome/browser/chromeos/drive/fileapi/async_file_util.h

@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback.h"
-#include "webkit/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/async_file_util.h"
 
 namespace drive {
 

chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.cc

@@ -15,10 +15,10 @@
 #include "chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/blob/file_stream_reader.h"
-#include "webkit/browser/fileapi/async_file_util.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/async_file_util.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 

chrome/browser/chromeos/drive/fileapi/fileapi_worker.cc

@@ -14,8 +14,8 @@
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "content/public/browser/browser_thread.h"
+#include "storage/browser/fileapi/file_system_url.h"
 #include "storage/common/fileapi/directory_entry.h"
-#include "webkit/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 

chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl.h

@@ -13,7 +13,7 @@
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h"
 #include "net/base/completion_callback.h"
-#include "webkit/browser/blob/file_stream_reader.h"
+#include "storage/browser/blob/file_stream_reader.h"
 
 namespace base {
 class SequencedTaskRunner;

chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.cc

@@ -12,7 +12,7 @@
 #include "google_apis/drive/task_util.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "webkit/browser/fileapi/file_stream_writer.h"
+#include "storage/browser/fileapi/file_stream_writer.h"
 
 using content::BrowserThread;
 

chrome/browser/chromeos/drive/fileapi/webkit_file_stream_writer_impl.h

@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "webkit/browser/fileapi/file_stream_writer.h"
+#include "storage/browser/fileapi/file_stream_writer.h"
 
 namespace base {
 class TaskRunner;

chrome/browser/chromeos/extensions/file_manager/event_router.h

@@ -24,7 +24,7 @@
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/network/network_state_handler_observer.h"
-#include "webkit/browser/fileapi/file_system_operation.h"
+#include "storage/browser/fileapi/file_system_operation.h"
 
 class PrefChangeRegistrar;
 class Profile;

chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc

@@ -44,11 +44,11 @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "storage/browser/fileapi/file_system_backend.h"
+#include "storage/browser/fileapi/file_system_context.h"
 #include "storage/common/fileapi/file_system_info.h"
 #include "storage/common/fileapi/file_system_util.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
-#include "webkit/browser/fileapi/file_system_backend.h"
-#include "webkit/browser/fileapi/file_system_context.h"
 
 using content::BrowserThread;
 using extensions::api::file_browser_handler_internal::FileEntryInfo;

chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc

@@ -20,8 +20,8 @@
 #include "content/public/browser/browser_context.h"
 #include "extensions/common/extension.h"
 #include "extensions/test/result_catcher.h"
+#include "storage/browser/fileapi/external_mount_points.h"
 #include "storage/common/fileapi/file_system_types.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
 
 namespace utils = extension_function_test_utils;
 

chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc

@@ -30,14 +30,14 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "net/base/escape.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_file_util.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_operation_runner.h"
+#include "storage/browser/fileapi/file_system_url.h"
 #include "storage/common/fileapi/file_system_info.h"
 #include "storage/common/fileapi/file_system_types.h"
 #include "storage/common/fileapi/file_system_util.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_file_util.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/file_system_url.h"
 
 using chromeos::disks::DiskMountManager;
 using content::BrowserThread;

chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc

@@ -15,8 +15,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/filename_util.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 using storage::FileSystemURL;

chrome/browser/chromeos/extensions/file_manager/private_api_util.cc

@@ -23,9 +23,9 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/file_manager_private.h"
 #include "content/public/browser/child_process_security_policy.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
 #include "ui/shell_dialogs/selected_file_info.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
 
 namespace file_manager_private = extensions::api::file_manager_private;
 

chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc

@@ -28,7 +28,7 @@
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "google_apis/drive/time_util.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/external_mount_points.h"
 
 // Tests for access to external file systems (as defined in
 // storage/common/fileapi/file_system_types.h) from extensions with

chrome/browser/chromeos/file_manager/file_browser_handlers.cc

@@ -32,10 +32,10 @@
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "net/base/escape.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
 #include "storage/common/fileapi/file_system_info.h"
 #include "storage/common/fileapi/file_system_util.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

@@ -49,7 +49,7 @@
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/external_mount_points.h"
 
 using drive::DriveIntegrationServiceFactory;
 

chrome/browser/chromeos/file_manager/file_tasks.cc

@@ -31,7 +31,7 @@
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_set.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 using extensions::Extension;
 using extensions::app_file_handler_util::FindFileHandlersForFiles;