Index: chrome/browser/chromeos/drive/file_system.cc |
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc |
index 9fa085a3b6ddb2501322355aab7ce7b2da098df7..3f6fae5f1bbad0fec3e04e4ba03867034e834615 100644 |
--- a/chrome/browser/chromeos/drive/file_system.cc |
+++ b/chrome/browser/chromeos/drive/file_system.cc |
@@ -131,7 +131,7 @@ FileSystem::GetFileCompleteForOpenParams::GetFileCompleteForOpenParams( |
struct FileSystem::GetResolvedFileParams { |
GetResolvedFileParams( |
const base::FilePath& drive_file_path, |
- const DriveClientContext& context, |
+ const ClientContext& context, |
scoped_ptr<ResourceEntry> entry, |
const GetFileContentInitializedCallback& initialized_callback, |
const GetFileCallback& get_file_callback, |
@@ -180,7 +180,7 @@ struct FileSystem::GetResolvedFileParams { |
} |
const base::FilePath drive_file_path; |
- const DriveClientContext context; |
+ const ClientContext context; |
scoped_ptr<ResourceEntry> entry; |
const GetFileContentInitializedCallback initialized_callback; |
const GetFileCallback get_file_callback; |
@@ -519,7 +519,7 @@ void FileSystem::OnGetResourceEntryCompleteForGetFileByPath( |
GetResolvedFileByPath( |
make_scoped_ptr(new GetResolvedFileParams( |
file_path, |
- DriveClientContext(USER_INITIATED), |
+ ClientContext(USER_INITIATED), |
entry.Pass(), |
GetFileContentInitializedCallback(), |
callback, |
@@ -528,7 +528,7 @@ void FileSystem::OnGetResourceEntryCompleteForGetFileByPath( |
void FileSystem::GetFileByResourceId( |
const std::string& resource_id, |
- const DriveClientContext& context, |
+ const ClientContext& context, |
const GetFileCallback& get_file_callback, |
const google_apis::GetContentCallback& get_content_callback) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
@@ -545,7 +545,7 @@ void FileSystem::GetFileByResourceId( |
} |
void FileSystem::GetFileByResourceIdAfterGetEntry( |
- const DriveClientContext& context, |
+ const ClientContext& context, |
const GetFileCallback& get_file_callback, |
const google_apis::GetContentCallback& get_content_callback, |
FileError error, |
@@ -611,7 +611,7 @@ void FileSystem::GetFileContentByPathAfterGetEntry( |
GetResolvedFileByPath( |
make_scoped_ptr(new GetResolvedFileParams( |
file_path, |
- DriveClientContext(USER_INITIATED), |
+ ClientContext(USER_INITIATED), |
entry.Pass(), |
initialized_callback, |
base::Bind(&GetFileCallbackToFileOperationCallbackAdapter, |
@@ -1149,7 +1149,7 @@ void FileSystem::RefreshDirectoryAfterGetResourceEntry( |
void FileSystem::UpdateFileByResourceId( |
const std::string& resource_id, |
- const DriveClientContext& context, |
+ const ClientContext& context, |
const FileOperationCallback& callback) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
DCHECK(!callback.is_null()); |
@@ -1409,7 +1409,7 @@ void FileSystem::OnGetResourceEntryCompleteForOpenFile( |
GetResolvedFileByPath( |
make_scoped_ptr(new GetResolvedFileParams( |
file_path, |
- DriveClientContext(USER_INITIATED), |
+ ClientContext(USER_INITIATED), |
entry.Pass(), |
GetFileContentInitializedCallback(), |
base::Bind(&FileSystem::OnGetFileCompleteForOpenFile, |