Chromium Code Reviews| Index: chrome/browser/chromeos/drive/drive_file_system_util.cc |
| diff --git a/chrome/browser/chromeos/drive/drive_file_system_util.cc b/chrome/browser/chromeos/drive/drive_file_system_util.cc |
| index 107525bf7665863f7d3ffbc311d7c89b19a1ad9a..b99f669b6040c9ed9f9e46c77095934b85aac191 100644 |
| --- a/chrome/browser/chromeos/drive/drive_file_system_util.cc |
| +++ b/chrome/browser/chromeos/drive/drive_file_system_util.cc |
| @@ -232,19 +232,13 @@ bool IsUnderDriveMountPoint(const base::FilePath& path) { |
| } |
| bool NeedsNamespaceMigration(const base::FilePath& path) { |
| - return false; |
| - // TODO(haruki): Update this along with http://crbug.com/174233. |
| - // return IsUnderDriveMountPoint(path) && |
| - // !(GetDriveMyDriveMountPointPath() == path || |
| - // GetDriveMyDriveMountPointPath().IsParent(path)); |
| + return IsUnderDriveMountPoint(path) && |
|
kinaba
2013/04/05 01:57:58
Could you add a short comment that what it means i
Haruki Sato
2013/04/05 04:43:06
Done.
|
| + !(GetDriveMyDriveMountPointPath() == path || |
| + GetDriveMyDriveMountPointPath().IsParent(path)); |
| } |
| base::FilePath ConvertToMyDriveNamespace(const base::FilePath& path) { |
| - // Double check the path. |
| - // TODO(haruki): Update this with DCHECK(NeedsNamespaceMigration(path)). |
| - DCHECK(IsUnderDriveMountPoint(path) && |
| - !(GetDriveMyDriveMountPointPath() == path || |
| - GetDriveMyDriveMountPointPath().IsParent(path))); |
| + DCHECK(NeedsNamespaceMigration(path)); |
| // Need to migrate "/special/drive(.*)" to "/special/drive/root(.*)". |
| // Append the relative path from "/special/drive". |