Move chrome/browser/chromeos/drive/resource* (+deps) into components/drive.

components/drive/file_system_core_util.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CORE_UTIL_H_
-#define CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CORE_UTIL_H_
+#ifndef COMPONENTS_DRIVE_FILE_SYSTEM_CORE_UTIL_H_
+#define COMPONENTS_DRIVE_FILE_SYSTEM_CORE_UTIL_H_

[hashimoto, 2015/08/14 00:47:54]

nit: How about naming this file components/drive/file_system_util.h?
Now this file is the only "file_system_util" in the directory so it seems there
is no need to have "core" in the name.

The same goes for file_system_core_util.cc and
file_system_core_util_unittest.cc.

[Łukasz Anforowicz, 2015/08/14 17:14:45]

Done.

[Łukasz Anforowicz, 2015/08/19 19:12:28]

Actually, I need to undo this renaming, because 1) it leads to a GN error [1,2]
about duplicate basenames and 2) there is no easy workaround [3].  Since this
was only a "nit", I assume that this is ok / doesn't need re-review (and in case
we still want to do it going forward, we can always do it in a separate CL.

[1]
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...
[2]
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...
[3]
https://groups.google.com/a/chromium.org/d/topic/chromium-dev/SnyltwzSoaU/dis...

 
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "components/drive/file_errors.h"
 #include "url/gurl.h"
 
 namespace drive {
 
@@ skipping 18 matching lines @@
 const char kDriveMyDriveRootDirName[] = "root";
 const char kDriveOtherDirName[] = "other";
 const char kDriveTrashDirName[] = "trash";
 
 // Returns the path of the top root of the pseudo tree.
 const base::FilePath& GetDriveGrandRootPath();
 
 // Returns the path of the directory representing "My Drive".
 const base::FilePath& GetDriveMyDriveRootPath();
 
-// Returns the Drive mount point path, which looks like
-// "/special/drive-<username_hash>", when provided with the |user_id_hash|.
-base::FilePath GetDriveMountPointPathForUserIdHash(std::string user_id_hash);
-
-// Returns true if the given path is under the Drive mount point.
-bool IsUnderDriveMountPoint(const base::FilePath& path);
-
-// Extracts the Drive path from the given path located under the Drive mount
-// point. Returns an empty path if |path| is not under the Drive mount point.
-// Examples: ExtractDrivePath("/special/drive-xxx/foo.txt") => "drive/foo.txt"
-base::FilePath ExtractDrivePath(const base::FilePath& path);
-
 // Escapes a file name in Drive cache.
 // Replaces percent ('%'), period ('.') and slash ('/') with %XX (hex)
 std::string EscapeCacheFileName(const std::string& filename);
 
 // Unescapes a file path in Drive cache.
 // This is the inverse of EscapeCacheFileName.
 std::string UnescapeCacheFileName(const std::string& filename);
 
 // Converts the given string to a form suitable as a file name. Specifically,
 // - Normalizes in Unicode Normalization Form C.
@@ skipping 25 matching lines @@
 
 // Reads URL from a GDoc file.
 GURL ReadUrlFromGDocFile(const base::FilePath& file_path);
 
 // Reads resource ID from a GDoc file.
 std::string ReadResourceIdFromGDocFile(const base::FilePath& file_path);
 
 }  // namespace util
 }  // namespace drive
 
-#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILE_SYSTEM_CORE_UTIL_H_
+#endif  // COMPONENTS_DRIVE_FILE_SYSTEM_CORE_UTIL_H_