| Index: chrome/browser/chromeos/drive/mock_drive_service.cc
|
| diff --git a/chrome/browser/chromeos/drive/mock_drive_service.cc b/chrome/browser/chromeos/drive/mock_drive_service.cc
|
| index 164d11fb84ffa3e66f0dd52a90f438645923adc4..dc42a758ade0b58978a00a0d45b6275f2cea81fc 100644
|
| --- a/chrome/browser/chromeos/drive/mock_drive_service.cc
|
| +++ b/chrome/browser/chromeos/drive/mock_drive_service.cc
|
| @@ -20,11 +20,11 @@ using ::testing::_;
|
| using ::testing::Invoke;
|
| using ::testing::Return;
|
|
|
| -namespace gdata {
|
| +namespace drive {
|
|
|
| MockDriveService::MockDriveService() {
|
| ON_CALL(*this, GetProgressStatusList())
|
| - .WillByDefault(Return(OperationProgressStatusList()));
|
| + .WillByDefault(Return(gdata::OperationProgressStatusList()));
|
| ON_CALL(*this, Authenticate(_))
|
| .WillByDefault(Invoke(this, &MockDriveService::AuthenticateStub));
|
| ON_CALL(*this, GetDocuments(_, _, _, _, _))
|
| @@ -53,24 +53,24 @@ MockDriveService::MockDriveService() {
|
|
|
| // Fill in the default values for mock feeds.
|
| account_metadata_ =
|
| - test_util::LoadJSONFile("gdata/account_metadata.json");
|
| - feed_data_ = test_util::LoadJSONFile("gdata/basic_feed.json");
|
| + gdata::test_util::LoadJSONFile("gdata/account_metadata.json");
|
| + feed_data_ = gdata::test_util::LoadJSONFile("gdata/basic_feed.json");
|
| directory_data_ =
|
| - test_util::LoadJSONFile("gdata/new_folder_entry.json");
|
| + gdata::test_util::LoadJSONFile("gdata/new_folder_entry.json");
|
| }
|
|
|
| MockDriveService::~MockDriveService() {}
|
|
|
| void MockDriveService::set_search_result(
|
| const std::string& search_result_feed) {
|
| - search_result_ = test_util::LoadJSONFile(search_result_feed);
|
| + search_result_ = gdata::test_util::LoadJSONFile(search_result_feed);
|
| }
|
|
|
| void MockDriveService::AuthenticateStub(
|
| - const AuthStatusCallback& callback) {
|
| + const gdata::AuthStatusCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, "my_auth_token"));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS, "my_auth_token"));
|
| }
|
|
|
| void MockDriveService::GetDocumentsStub(
|
| @@ -78,31 +78,34 @@ void MockDriveService::GetDocumentsStub(
|
| int64 start_changestamp,
|
| const std::string& search_string,
|
| const std::string& directory_resource_id,
|
| - const GetDataCallback& callback) {
|
| + const gdata::GetDataCallback& callback) {
|
| if (search_string.empty()) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, base::Passed(&feed_data_)));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS,
|
| + base::Passed(&feed_data_)));
|
| } else {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, base::Passed(&search_result_)));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS,
|
| + base::Passed(&search_result_)));
|
| }
|
| }
|
|
|
| void MockDriveService::GetAccountMetadataStub(
|
| - const GetDataCallback& callback) {
|
| + const gdata::GetDataCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, base::Passed(&account_metadata_)));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS,
|
| + base::Passed(&account_metadata_)));
|
| }
|
|
|
| void MockDriveService::DeleteDocumentStub(
|
| const GURL& document_url,
|
| - const EntryActionCallback& callback) {
|
| + const gdata::EntryActionCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, document_url));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS, document_url));
|
| }
|
|
|
| void MockDriveService::DownloadDocumentStub(
|
| @@ -110,65 +113,66 @@ void MockDriveService::DownloadDocumentStub(
|
| const FilePath& local_tmp_path,
|
| const GURL& content_url,
|
| DocumentExportFormat format,
|
| - const DownloadActionCallback& callback) {
|
| + const gdata::DownloadActionCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, content_url, local_tmp_path));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS, content_url, local_tmp_path));
|
| }
|
|
|
| void MockDriveService::CopyDocumentStub(
|
| const std::string& resource_id,
|
| const FilePath::StringType& new_name,
|
| - const GetDataCallback& callback) {
|
| + const gdata::GetDataCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, base::Passed(&document_data_)));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS, base::Passed(&document_data_)));
|
| }
|
|
|
| void MockDriveService::RenameResourceStub(
|
| const GURL& resource_url,
|
| const FilePath::StringType& new_name,
|
| - const EntryActionCallback& callback) {
|
| + const gdata::EntryActionCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, resource_url));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS, resource_url));
|
| }
|
|
|
| void MockDriveService::AddResourceToDirectoryStub(
|
| const GURL& parent_content_url,
|
| const GURL& resource_url,
|
| - const EntryActionCallback& callback) {
|
| + const gdata::EntryActionCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, resource_url));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS, resource_url));
|
| }
|
|
|
| void MockDriveService::RemoveResourceFromDirectoryStub(
|
| const GURL& parent_content_url,
|
| const GURL& resource_url,
|
| const std::string& resource_id,
|
| - const EntryActionCallback& callback) {
|
| + const gdata::EntryActionCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, resource_url));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS, resource_url));
|
| }
|
|
|
| void MockDriveService::CreateDirectoryStub(
|
| const GURL& parent_content_url,
|
| const FilePath::StringType& directory_name,
|
| - const GetDataCallback& callback) {
|
| + const gdata::GetDataCallback& callback) {
|
| base::MessageLoopProxy::current()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(callback, HTTP_SUCCESS, base::Passed(&directory_data_)));
|
| + base::Bind(callback, gdata::HTTP_SUCCESS,
|
| + base::Passed(&directory_data_)));
|
| }
|
|
|
| void MockDriveService::DownloadFileStub(
|
| const FilePath& virtual_path,
|
| const FilePath& local_tmp_path,
|
| const GURL& content_url,
|
| - const DownloadActionCallback& download_action_callback,
|
| - const GetContentCallback& get_content_callback) {
|
| - GDataErrorCode error = HTTP_SUCCESS;
|
| + const gdata::DownloadActionCallback& download_action_callback,
|
| + const gdata::GetContentCallback& get_content_callback) {
|
| + gdata::GDataErrorCode error = gdata::HTTP_SUCCESS;
|
| if (file_data_.get()) {
|
| int file_data_size = static_cast<int>(file_data_->size());
|
| ASSERT_EQ(file_data_size,
|
| @@ -180,4 +184,4 @@ void MockDriveService::DownloadFileStub(
|
| base::Bind(download_action_callback, error, content_url, local_tmp_path));
|
| }
|
|
|
| -} // namespace gdata
|
| +} // namespace drive
|
|
|