Move //components/filesystem to //components/services/

Moves this service into the canonical location for services within
//components.

The existing code causes several presubmit warnings. This CL does not
attempt to fix them.

TBR=dcheng@chromium.org
NOPRESUBMIT=true

Change-Id: I3301416c1f7dd619d2a24d165c4fed9267b4eb77
Reviewed-on: https://chromium-review.googlesource.com/948913
Commit-Queue: Colin Blundell <blundell@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542795}

BUILD.gn

@@ -658,9 +658,9 @@ group("gn_all") {
       "//chrome/installer/util:strings",
       "//chrome/tools/convert_dict",
       "//components/constrained_window:unit_tests",
-      "//components/filesystem:filesystem_service_unittests",
       "//components/metrics:serialization",
       "//components/rappor:unit_tests",
+      "//components/services/filesystem:filesystem_service_unittests",
       "//components/services/leveldb:leveldb_service_unittests",
       "//components/sessions:unit_tests",
       "//media/blink:media_blink_unittests",

chrome/services/file_util/BUILD.gn

@@ -28,7 +28,7 @@ source_set("lib") {
       "zip_file_creator.h",
     ]
 
-    deps += [ "//components/filesystem/public/interfaces" ]
+    deps += [ "//components/services/filesystem/public/interfaces" ]
   }
 
   if (safe_browsing_mode == 1) {

chrome/services/file_util/DEPS

@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/filesystem",
+  "+components/services/filesystem",
   "+chrome/utility/safe_browsing",
   "+third_party/zlib/google",
 ]

chrome/services/file_util/public/cpp/zip_file_creator.cc

@@ -10,8 +10,8 @@
 #include "base/callback_helpers.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/services/file_util/public/mojom/constants.mojom.h"
-#include "components/filesystem/directory_impl.h"
-#include "components/filesystem/lock_table.h"
+#include "components/services/filesystem/directory_impl.h"
+#include "components/services/filesystem/lock_table.h"
 #include "content/public/browser/browser_thread.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/connector.h"

chrome/services/file_util/public/mojom/BUILD.gn

@@ -20,6 +20,6 @@ mojom("mojom") {
 
   if (is_chromeos) {
     sources += [ "zip_file_creator.mojom" ]
-    public_deps += [ "//components/filesystem/public/interfaces" ]
+    public_deps += [ "//components/services/filesystem/public/interfaces" ]
   }
 }

chrome/services/file_util/public/mojom/zip_file_creator.mojom

@@ -7,7 +7,7 @@
 
 module chrome.mojom;
 
-import "components/filesystem/public/interfaces/directory.mojom";
+import "components/services/filesystem/public/interfaces/directory.mojom";
 import "mojo/common/file.mojom";
 import "mojo/common/file_path.mojom";
 

chrome/services/file_util/zip_file_creator.cc

@@ -9,7 +9,7 @@
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
-#include "components/filesystem/public/interfaces/types.mojom-shared.h"
+#include "components/services/filesystem/public/interfaces/types.mojom-shared.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "third_party/zlib/google/zip.h"
 

chrome/services/file_util/zip_file_creator.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "chrome/services/file_util/public/mojom/zip_file_creator.mojom.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 #include "services/service_manager/public/cpp/service_context_ref.h"
 
 namespace base {

components/patch_service/BUILD.gn

@@ -15,7 +15,7 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
     "//courgette:courgette_lib",
     "//mojo/public/cpp/bindings",
   ]

components/services/filesystem/BUILD.gn

@@ -26,7 +26,7 @@ static_library("lib") {
 
   deps = [
     "//base",
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
     "//mojo/common",
     "//mojo/common:common_base",
     "//mojo/public/cpp/system",
@@ -48,7 +48,7 @@ if (!is_ios) {
     deps = [
       ":lib",
       "//base",
-      "//components/filesystem/public/interfaces",
+      "//components/services/filesystem/public/interfaces",
       "//mojo/common",
       "//mojo/public/cpp/bindings",
       "//mojo/public/cpp/system",
@@ -73,7 +73,7 @@ if (!is_ios) {
 
     deps = [
       "//base",
-      "//components/filesystem/public/interfaces",
+      "//components/services/filesystem/public/interfaces",
       "//mojo/common",
       "//mojo/public/cpp/bindings",
       "//mojo/public/cpp/system",

components/services/filesystem/directory_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 "components/filesystem/directory_impl.h"
+#include "components/services/filesystem/directory_impl.h"
 
 #include <memory>
 #include <string>
@@ -15,9 +15,9 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "components/filesystem/file_impl.h"
-#include "components/filesystem/lock_table.h"
-#include "components/filesystem/util.h"
+#include "components/services/filesystem/file_impl.h"
+#include "components/services/filesystem/lock_table.h"
+#include "components/services/filesystem/util.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace filesystem {

components/services/filesystem/directory_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 COMPONENTS_FILESYSTEM_DIRECTORY_IMPL_H_
-#define COMPONENTS_FILESYSTEM_DIRECTORY_IMPL_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_DIRECTORY_IMPL_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_DIRECTORY_IMPL_H_
 
 #include <stdint.h>
 
@@ -12,8 +12,8 @@
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
-#include "components/filesystem/shared_temp_dir.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/shared_temp_dir.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace filesystem {
@@ -78,4 +78,4 @@ class DirectoryImpl : public mojom::Directory {
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_DIRECTORY_IMPL_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_DIRECTORY_IMPL_H_

components/services/filesystem/directory_impl_unittest.cc

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "components/filesystem/files_test_base.h"
+#include "components/services/filesystem/files_test_base.h"
 
 namespace filesystem {
 namespace {

components/services/filesystem/file_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 "components/filesystem/file_impl.h"
+#include "components/services/filesystem/file_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -16,9 +16,9 @@
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "components/filesystem/lock_table.h"
-#include "components/filesystem/shared_temp_dir.h"
-#include "components/filesystem/util.h"
+#include "components/services/filesystem/lock_table.h"
+#include "components/services/filesystem/shared_temp_dir.h"
+#include "components/services/filesystem/util.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 static_assert(sizeof(off_t) <= sizeof(int64_t), "off_t too big");
@@ -169,8 +169,8 @@ void FileImpl::Write(const std::vector<uint8_t>& bytes_to_write,
   const char* buf = (bytes_to_write.size() > 0)
                         ? reinterpret_cast<const char*>(&bytes_to_write.front())
                         : nullptr;
-  int num_bytes_written = file_.WriteAtCurrentPos(
-      buf, static_cast<int>(bytes_to_write.size()));
+  int num_bytes_written =
+      file_.WriteAtCurrentPos(buf, static_cast<int>(bytes_to_write.size()));
   if (num_bytes_written < 0) {
     std::move(callback).Run(base::File::Error::FILE_ERROR_FAILED, 0);
     return;

components/services/filesystem/file_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 COMPONENTS_FILESYSTEM_FILE_IMPL_H_
-#define COMPONENTS_FILESYSTEM_FILE_IMPL_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_FILE_IMPL_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_FILE_IMPL_H_
 
 #include <stdint.h>
 
@@ -11,7 +11,7 @@
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
 #include "build/build_config.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace base {
@@ -83,4 +83,4 @@ class FileImpl : public mojom::File {
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_FILE_IMPL_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_FILE_IMPL_H_

components/services/filesystem/file_impl_unittest.cc

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/files/file.h"
-#include "components/filesystem/files_test_base.h"
+#include "components/services/filesystem/files_test_base.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 

components/services/filesystem/file_system_app.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 "components/filesystem/file_system_app.h"
+#include "components/services/filesystem/file_system_app.h"
 
 #include <memory>
 
@@ -34,7 +34,7 @@ namespace {
 
 const char kUserDataDir[] = "user-data-dir";
 
-}  // namespace filesystem
+}  // namespace
 
 FileSystemApp::FileSystemApp() : lock_table_(new LockTable) {
   registry_.AddInterface<mojom::FileSystem>(
@@ -61,7 +61,7 @@ void FileSystemApp::Create(mojom::FileSystemRequest request,
       std::move(request));
 }
 
-//static
+// static
 base::FilePath FileSystemApp::GetUserDataDir() {
   base::FilePath path;
 
@@ -77,9 +77,8 @@ base::FilePath FileSystemApp::GetUserDataDir() {
     CHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &path));
 #elif defined(OS_LINUX)
     std::unique_ptr<base::Environment> env(base::Environment::Create());
-    path = base::nix::GetXDGDirectory(env.get(),
-                                      base::nix::kXdgConfigHomeEnvVar,
-                                      base::nix::kDotConfigDir);
+    path = base::nix::GetXDGDirectory(
+        env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir);
 #else
     NOTIMPLEMENTED();
 #endif

components/services/filesystem/file_system_app.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 COMPONENTS_FILESYSTEM_FILE_SYSTEM_APP_H_
-#define COMPONENTS_FILESYSTEM_FILE_SYSTEM_APP_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_FILE_SYSTEM_APP_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_FILE_SYSTEM_APP_H_
 
 #include "base/macros.h"
-#include "components/filesystem/directory_impl.h"
-#include "components/filesystem/file_system_impl.h"
-#include "components/filesystem/lock_table.h"
-#include "components/filesystem/public/interfaces/file_system.mojom.h"
+#include "components/services/filesystem/directory_impl.h"
+#include "components/services/filesystem/file_system_impl.h"
+#include "components/services/filesystem/lock_table.h"
+#include "components/services/filesystem/public/interfaces/file_system.mojom.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 
@@ -44,4 +44,4 @@ class FileSystemApp : public service_manager::Service {
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_FILE_SYSTEM_APP_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_FILE_SYSTEM_APP_H_

components/services/filesystem/file_system_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 "components/filesystem/file_system_impl.h"
+#include "components/services/filesystem/file_system_impl.h"
 
 #include <stddef.h>
 
@@ -16,8 +16,8 @@
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
-#include "components/filesystem/directory_impl.h"
-#include "components/filesystem/lock_table.h"
+#include "components/services/filesystem/directory_impl.h"
+#include "components/services/filesystem/lock_table.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "url/gurl.h"
@@ -31,8 +31,7 @@ FileSystemImpl::FileSystemImpl(const service_manager::Identity& remote_identity,
       lock_table_(std::move(lock_table)),
       persistent_dir_(persistent_dir) {}
 
-FileSystemImpl::~FileSystemImpl() {
-}
+FileSystemImpl::~FileSystemImpl() {}
 
 void FileSystemImpl::OpenTempDirectory(mojom::DirectoryRequest directory,
                                        OpenTempDirectoryCallback callback) {

components/services/filesystem/file_system_impl.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 COMPONENTS_FILESYSTEM_FILE_SYSTEM_IMPL_H_
-#define COMPONENTS_FILESYSTEM_FILE_SYSTEM_IMPL_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_FILE_SYSTEM_IMPL_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_FILE_SYSTEM_IMPL_H_
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "components/filesystem/shared_temp_dir.h"
+#include "components/services/filesystem/public/interfaces/file_system.mojom.h"
+#include "components/services/filesystem/shared_temp_dir.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 
 namespace base {
@@ -51,4 +51,4 @@ class FileSystemImpl : public mojom::FileSystem {
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_FILE_SYSTEM_IMPL_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_FILE_SYSTEM_IMPL_H_

components/services/filesystem/files_test_base.cc

@@ -2,22 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/filesystem/files_test_base.h"
+#include "components/services/filesystem/files_test_base.h"
 
 #include <utility>
 
-#include "components/filesystem/public/interfaces/directory.mojom.h"
-#include "components/filesystem/public/interfaces/types.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/types.mojom.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace filesystem {
 
-FilesTestBase::FilesTestBase()
-    : ServiceTest("filesystem_service_unittests") {
-}
+FilesTestBase::FilesTestBase() : ServiceTest("filesystem_service_unittests") {}
 
-FilesTestBase::~FilesTestBase() {
-}
+FilesTestBase::~FilesTestBase() {}
 
 void FilesTestBase::SetUp() {
   ServiceTest::SetUp();

components/services/filesystem/files_test_base.h

@@ -2,20 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_FILESYSTEM_FILES_TEST_BASE_H_
-#define COMPONENTS_FILESYSTEM_FILES_TEST_BASE_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_FILES_TEST_BASE_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_FILES_TEST_BASE_H_
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
-#include "components/filesystem/public/interfaces/file_system.mojom.h"
+#include "components/services/filesystem/public/interfaces/file_system.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/service_manager/public/cpp/service_test.h"
 
 namespace filesystem {
 
-template <typename... Args> void IgnoreAllArgs(Args&&... args) {}
+template <typename... Args>
+void IgnoreAllArgs(Args&&... args) {}
 
 template <typename... Args>
 void DoCaptures(Args*... out_args, Args... in_args) {
@@ -60,4 +61,4 @@ class FilesTestBase : public service_manager::test::ServiceTest {
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_FILES_TEST_BASE_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_FILES_TEST_BASE_H_

components/services/filesystem/lock_table.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/filesystem/lock_table.h"
+#include "components/services/filesystem/lock_table.h"
 
 #include "build/build_config.h"
-#include "components/filesystem/file_impl.h"
+#include "components/services/filesystem/file_impl.h"
 
 namespace filesystem {
 

components/services/filesystem/lock_table.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 COMPONENTS_FILESYSTEM_LOCK_TABLE_H_
-#define COMPONENTS_FILESYSTEM_LOCK_TABLE_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_LOCK_TABLE_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_LOCK_TABLE_H_
 
 #include <set>
 
@@ -45,4 +45,4 @@ class LockTable : public base::RefCounted<LockTable> {
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_LOCK_TABLE_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_LOCK_TABLE_H_

components/services/filesystem/main.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/macros.h"
-#include "components/filesystem/file_system_app.h"
 #include "services/service_manager/public/c/main.h"
+#include "base/macros.h"
+#include "components/services/filesystem/file_system_app.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 
 MojoResult ServiceMain(MojoHandle request) {

components/services/filesystem/public/interfaces/directory.mojom

@@ -4,8 +4,8 @@
 
 module filesystem.mojom;
 
-import "components/filesystem/public/interfaces/file.mojom";
-import "components/filesystem/public/interfaces/types.mojom";
+import "components/services/filesystem/public/interfaces/file.mojom";
+import "components/services/filesystem/public/interfaces/types.mojom";
 import "mojo/common/file.mojom";
 import "mojo/public/mojom/base/file_error.mojom";
 

components/services/filesystem/public/interfaces/file.mojom

@@ -9,7 +9,7 @@
 
 module filesystem.mojom;
 
-import "components/filesystem/public/interfaces/types.mojom";
+import "components/services/filesystem/public/interfaces/types.mojom";
 import "mojo/common/file.mojom";
 import "mojo/public/mojom/base/file_error.mojom";
 

components/services/filesystem/public/interfaces/file_system.mojom

@@ -4,7 +4,7 @@
 
 module filesystem.mojom;
 
-import "components/filesystem/public/interfaces/directory.mojom";
+import "components/services/filesystem/public/interfaces/directory.mojom";
 import "mojo/public/mojom/base/file_error.mojom";
 
 interface FileSystem {

components/services/filesystem/shared_temp_dir.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 "components/filesystem/shared_temp_dir.h"
+#include "components/services/filesystem/shared_temp_dir.h"
 
 #include "base/files/scoped_temp_dir.h"
 

components/services/filesystem/shared_temp_dir.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 COMPONENTS_FILESYSTEM_SHARED_TEMP_DIR_H_
-#define COMPONENTS_FILESYSTEM_SHARED_TEMP_DIR_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_SHARED_TEMP_DIR_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_SHARED_TEMP_DIR_H_
 
 #include "base/memory/ref_counted.h"
 
@@ -30,4 +30,4 @@ class SharedTempDir : public base::RefCounted<SharedTempDir> {
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_SHARED_TEMP_DIR_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_SHARED_TEMP_DIR_H_

components/services/filesystem/util.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 "components/filesystem/util.h"
+#include "components/services/filesystem/util.h"
 
 #include <errno.h>
 #include <fcntl.h>

components/services/filesystem/util.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 COMPONENTS_FILESYSTEM_UTIL_H_
-#define COMPONENTS_FILESYSTEM_UTIL_H_
+#ifndef COMPONENTS_SERVICES_FILESYSTEM_UTIL_H_
+#define COMPONENTS_SERVICES_FILESYSTEM_UTIL_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/files/file.h"
-#include "components/filesystem/public/interfaces/types.mojom.h"
+#include "components/services/filesystem/public/interfaces/types.mojom.h"
 
 namespace filesystem {
 
@@ -48,4 +48,4 @@ base::File::Error ValidatePath(const std::string& raw_path,
 
 }  // namespace filesystem
 
-#endif  // COMPONENTS_FILESYSTEM_UTIL_H_
+#endif  // COMPONENTS_SERVICES_FILESYSTEM_UTIL_H_

components/services/leveldb/BUILD.gn

@@ -21,7 +21,7 @@ static_library("lib") {
   ]
 
   public_deps = [
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
     "//components/services/leveldb/public/cpp",
     "//components/services/leveldb/public/interfaces",
   ]
@@ -67,7 +67,7 @@ service_test("leveldb_service_unittests") {
 
   deps = [
     "//base",
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
     "//components/services/leveldb/public/cpp",
     "//components/services/leveldb/public/interfaces",
     "//mojo/common",
@@ -80,7 +80,7 @@ service_test("leveldb_service_unittests") {
 
   data_deps = [
     ":leveldb",
-    "//components/filesystem:filesystem",
+    "//components/services/filesystem:filesystem",
   ]
 }
 
@@ -93,6 +93,6 @@ catalog("leveldb_service_unittests_catalog") {
   embedded_services = [ ":test_manifest" ]
   standalone_services = [
     ":manifest",
-    "//components/filesystem:manifest",
+    "//components/services/filesystem:manifest",
   ]
 }

components/services/leveldb/DEPS

@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/filesystem/public/interfaces",
+  "+components/services/filesystem/public/interfaces",
   "+mojo/common",
   "+mojo/public",
   "+mojo/util",

components/services/leveldb/env_mojo.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 #include "components/services/leveldb/leveldb_mojo_proxy.h"
 #include "third_party/leveldatabase/env_chromium.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"

components/services/leveldb/leveldb_mojo_proxy.h

@@ -17,7 +17,7 @@
 #include "base/sequenced_task_runner.h"
 
 #include "base/synchronization/waitable_event.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 
 namespace leveldb {
 

components/services/leveldb/leveldb_service_unittest.cc

@@ -5,9 +5,9 @@
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
-#include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "components/filesystem/public/interfaces/types.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/file_system.mojom.h"
+#include "components/services/filesystem/public/interfaces/types.mojom.h"
 #include "components/services/leveldb/public/cpp/util.h"
 #include "components/services/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"

components/services/leveldb/public/interfaces/BUILD.gn

@@ -12,7 +12,7 @@ mojom("interfaces") {
   ]
 
   deps = [
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
   ]
 
   public_deps = [

components/services/leveldb/public/interfaces/leveldb.mojom

@@ -4,7 +4,7 @@
 
 module leveldb.mojom;
 
-import "components/filesystem/public/interfaces/directory.mojom";
+import "components/services/filesystem/public/interfaces/directory.mojom";
 import "mojo/common/unguessable_token.mojom";
 import "mojo/common/memory_allocator_dump_cross_process_uid.mojom";
 

components/unzip_service/BUILD.gn

@@ -20,7 +20,7 @@ source_set("lib") {
   ]
 
   public_deps = [
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
     "//components/unzip_service/public/interfaces",
     "//services/service_manager/public/cpp",
   ]

components/unzip_service/DEPS

@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/filesystem",
+  "+components/services/filesystem",
   "+mojo/public",
   "+services/service_manager/public",
   "+third_party/zlib/google",

components/unzip_service/public/cpp/BUILD.gn

@@ -11,7 +11,7 @@ source_set("cpp") {
   ]
 
   public_deps = [
-    "//components/filesystem:lib",
+    "//components/services/filesystem:lib",
     "//components/unzip_service/public/interfaces",
     "//services/service_manager/public/cpp",
   ]

components/unzip_service/public/cpp/unzip.cc

@@ -16,8 +16,8 @@
 #include "base/strings/string16.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "components/filesystem/directory_impl.h"
-#include "components/filesystem/lock_table.h"
+#include "components/services/filesystem/directory_impl.h"
+#include "components/services/filesystem/lock_table.h"
 #include "components/unzip_service/public/interfaces/constants.mojom.h"
 #include "components/unzip_service/public/interfaces/unzipper.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"

components/unzip_service/public/interfaces/BUILD.gn

@@ -11,7 +11,7 @@ mojom("interfaces") {
 
   public_deps = [
     ":constants",
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
     "//mojo/common:common_custom_types",
   ]
 }

components/unzip_service/public/interfaces/unzipper.mojom

@@ -6,7 +6,7 @@ module unzip.mojom;
 
 import "mojo/common/file.mojom";
 import "mojo/common/file_path.mojom";
-import "components/filesystem/public/interfaces/directory.mojom";
+import "components/services/filesystem/public/interfaces/directory.mojom";
 
 interface UnzipFilter {
   [Sync]

content/browser/BUILD.gn

@@ -48,7 +48,6 @@ jumbo_source_set("browser") {
     "//components/download/public/common:public",
     "//components/download/quarantine",
     "//components/filename_generation",
-    "//components/filesystem:lib",
     "//components/link_header_util",
     "//components/metrics",
     "//components/metrics:single_sample_metrics",
@@ -56,6 +55,7 @@ jumbo_source_set("browser") {
     "//components/offline_pages/buildflags",
     "//components/offline_pages/core/request_header",
     "//components/rappor",
+    "//components/services/filesystem:lib",
     "//components/services/leveldb:lib",
     "//components/tracing",
     "//components/tracing:startup_tracing",

content/browser/DEPS

@@ -7,7 +7,7 @@ include_rules = [
   "+components/download/public/common",
   "+components/download/quarantine/quarantine.h",
   "+components/filename_generation",
-  "+components/filesystem",
+  "+components/services/filesystem",
   "+components/services/leveldb",
   "+components/link_header_util",
   "+components/metrics",

content/browser/dom_storage/local_storage_context_mojo_unittest.cc

@@ -11,7 +11,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
-#include "components/filesystem/public/interfaces/file_system.mojom.h"
+#include "components/services/filesystem/public/interfaces/file_system.mojom.h"
 #include "components/services/leveldb/public/cpp/util.h"
 #include "content/browser/dom_storage/dom_storage_area.h"
 #include "content/browser/dom_storage/dom_storage_context_impl.h"

content/test/BUILD.gn

@@ -1761,7 +1761,7 @@ test("content_unittests") {
   ]
 
   data_deps = [
-    "//components/filesystem:filesystem",
+    "//components/services/filesystem:filesystem",
     "//testing/buildbot/filters:content_unittests_filters",
     "//third_party/mesa:osmesa",
   ]

services/catalog/BUILD.gn

@@ -38,7 +38,7 @@ source_set("lib") {
   deps = [
     ":constants",
     "//base",
-    "//components/filesystem:lib",
+    "//components/services/filesystem:lib",
     "//services/catalog/public/cpp",
     "//services/catalog/public/mojom",
     "//services/service_manager/public/cpp",
@@ -46,7 +46,7 @@ source_set("lib") {
 
   public_deps = [
     # directory.mojom.h is #included by catalog.h
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
   ]
 }
 

services/catalog/DEPS

@@ -1,3 +1,3 @@
 include_rules = [
-  "+components/filesystem"
+  "+components/services/filesystem"
 ]

services/catalog/catalog.cc

@@ -20,9 +20,9 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
-#include "components/filesystem/directory_impl.h"
-#include "components/filesystem/lock_table.h"
-#include "components/filesystem/public/interfaces/types.mojom.h"
+#include "components/services/filesystem/directory_impl.h"
+#include "components/services/filesystem/lock_table.h"
+#include "components/services/filesystem/public/interfaces/types.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/constants.h"
 #include "services/catalog/entry_cache.h"

services/catalog/catalog.h

@@ -12,7 +12,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/catalog/entry_cache.h"

services/catalog/public/cpp/BUILD.gn

@@ -12,7 +12,7 @@ source_set("cpp") {
 
   deps = [
     "//base",
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//services/catalog:constants",

services/catalog/public/cpp/resource_loader.cc

@@ -9,7 +9,7 @@
 
 #include "base/bind.h"
 #include "base/files/file.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/mojom/interface_provider.mojom.h"

services/catalog/public/cpp/resource_loader.h

@@ -11,7 +11,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 
 namespace base {
 class File;

services/file/BUILD.gn

@@ -17,8 +17,8 @@ source_set("lib") {
 
   deps = [
     "//base",
-    "//components/filesystem:lib",
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem:lib",
+    "//components/services/filesystem/public/interfaces",
     "//components/services/leveldb:lib",
     "//components/services/leveldb/public/interfaces",
     "//mojo/common",

services/file/DEPS

@@ -1,4 +1,4 @@
 include_rules = [
-  "+components/filesystem",
+  "+components/services/filesystem",
   "+components/services/leveldb",
 ]

services/file/file_service.cc

@@ -8,7 +8,7 @@
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/task_scheduler/post_task.h"
-#include "components/filesystem/lock_table.h"
+#include "components/services/filesystem/lock_table.h"
 #include "components/services/leveldb/leveldb_service_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/file/file_system.h"

services/file/file_service.h

@@ -8,7 +8,7 @@
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"
-#include "components/filesystem/lock_table.h"
+#include "components/services/filesystem/lock_table.h"
 #include "components/services/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/file/public/mojom/file_system.mojom.h"

services/file/file_system.cc

@@ -14,9 +14,9 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/filesystem/directory_impl.h"
-#include "components/filesystem/lock_table.h"
-#include "components/filesystem/public/interfaces/types.mojom.h"
+#include "components/services/filesystem/directory_impl.h"
+#include "components/services/filesystem/lock_table.h"
+#include "components/services/filesystem/public/interfaces/types.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 
 namespace file {

services/file/file_system.h

@@ -6,7 +6,7 @@
 #define SERVICES_FILE_FILE_SYSTEM_H_
 
 #include "base/files/file_path.h"
-#include "components/filesystem/public/interfaces/directory.mojom.h"
+#include "components/services/filesystem/public/interfaces/directory.mojom.h"
 #include "services/file/public/mojom/file_system.mojom.h"
 
 namespace filesystem {

services/file/public/mojom/BUILD.gn

@@ -10,7 +10,7 @@ mojom("mojom") {
   ]
 
   deps = [
-    "//components/filesystem/public/interfaces",
+    "//components/services/filesystem/public/interfaces",
   ]
 
   public_deps = [

services/file/public/mojom/file_system.mojom

@@ -4,7 +4,7 @@
 
 module file.mojom;
 
-import "components/filesystem/public/interfaces/directory.mojom";
+import "components/services/filesystem/public/interfaces/directory.mojom";
 import "mojo/public/mojom/base/file_error.mojom";
 
 // Provide access to various directories within the requesting user's directory.

testing/buildbot/gn_isolate_map.pyl

@@ -527,7 +527,7 @@
     "type": "windowed_test_launcher",
   },
   "filesystem_service_unittests": {
-    "label": "//components/filesystem:filesystem_service_unittests",
+    "label": "//components/services/filesystem:filesystem_service_unittests",
     "type": "console_test_launcher",
   },
   "gcm_unit_tests": {