| Index: chrome/browser/chromeos/gdata/gdata_util.cc
|
| diff --git a/chrome/browser/chromeos/gdata/gdata_util.cc b/chrome/browser/chromeos/gdata/gdata_util.cc
|
| index 74c8954e1eac33da8f2db2c679c5427dd8665b97..f99c72fac702a492adbf5d9fb0caaf1f25bdc822 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_util.cc
|
| +++ b/chrome/browser/chromeos/gdata/gdata_util.cc
|
| @@ -23,8 +23,8 @@
|
| #include "base/time.h"
|
| #include "base/tracked_objects.h"
|
| #include "chrome/browser/chromeos/gdata/drive.pb.h"
|
| +#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
|
| #include "chrome/browser/chromeos/gdata/file_write_helper.h"
|
| -#include "chrome/browser/chromeos/gdata/gdata_file_system_interface.h"
|
| #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
|
| #include "chrome/browser/chromeos/login/user.h"
|
| #include "chrome/browser/chromeos/login/user_manager.h"
|
| @@ -61,7 +61,7 @@ const int kReadOnlyFilePermissions = base::PLATFORM_FILE_OPEN |
|
| base::PLATFORM_FILE_EXCLUSIVE_READ |
|
| base::PLATFORM_FILE_ASYNC;
|
|
|
| -GDataFileSystemInterface* GetGDataFileSystem(Profile* profile) {
|
| +DriveFileSystemInterface* GetDriveFileSystem(Profile* profile) {
|
| GDataSystemService* system_service =
|
| GDataSystemServiceFactory::GetForProfile(profile);
|
| return system_service ? system_service->file_system() : NULL;
|
| @@ -238,7 +238,7 @@ void ModifyGDataFileResourceUrl(Profile* profile,
|
| GURL* url) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| - GDataFileSystemInterface* file_system = GetGDataFileSystem(profile);
|
| + DriveFileSystemInterface* file_system = GetDriveFileSystem(profile);
|
| if (!file_system)
|
| return;
|
| DriveCache* cache = GetDriveCache(profile);
|
| @@ -302,7 +302,7 @@ void InsertDriveCachePathsPermissions(
|
| DCHECK(cache_paths);
|
| DCHECK(!callback.is_null());
|
|
|
| - GDataFileSystemInterface* file_system = GetGDataFileSystem(profile);
|
| + DriveFileSystemInterface* file_system = GetDriveFileSystem(profile);
|
| if (!file_system || gdata_paths->empty()) {
|
| callback.Run();
|
| return;
|
|
|