chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 881403003: Rename gdata_errorcode.h to drive_api_error_codes.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Issue 881403003: Rename gdata_errorcode.h to drive_api_error_codes.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix typos in BUILD.gn Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/drive/test_util.cc ('K') | « chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc ('k') | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

index 92b0090a5f4c925490af8cd117a5eceb0a381df3..4c2b47315f35819132e9aeabf27e6aaa7cb98032 100644

--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

@@ -28,8 +28,8 @@

#include "chrome/browser/sync_file_system/sync_file_system_test_util.h"

#include "chrome/browser/sync_file_system/syncable_file_system_util.h"

#include "content/public/test/test_browser_thread_bundle.h"

+#include "google_apis/drive/drive_api_error_codes.h"

#include "google_apis/drive/drive_api_parser.h"

-#include "google_apis/drive/gdata_errorcode.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/leveldatabase/src/helpers/memenv/memenv.h"

#include "third_party/leveldatabase/src/include/leveldb/env.h"

@@ -157,10 +157,10 @@ class ConflictResolverTest : public testing::Test {

SYNC_FILE_TYPE_FILE));

}

- google_apis::GDataErrorCode AddFileToFolder(

+ google_apis::DriveApiErrorCode AddFileToFolder(

const std::string& parent_folder_id,

const std::string& file_id) {

- google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;

+ google_apis::DriveApiErrorCode error = google_apis::DRIVE_OTHER_ERROR;

context_->GetDriveService()->AddResourceToDirectory(

parent_folder_id, file_id,

CreateResultReceiver(&error));