Get rid of DriveEntryKind.

chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc
index b58bc548b3ebaea3a361a1335da7361e2677916c..e38b892a093e2926110668ac9536be75561cc022 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/api_util_unittest.cc
@@ -115,10 +115,11 @@ class APIUtilTest : public testing::Test {
                   entry));
   }
 
-  void VerifyTitleUniqueness(const std::string& parent_resource_id,
-                             const std::string& title,
-                             const std::string& resource_id,
-                             google_apis::DriveEntryKind kind) {
+  void VerifyTitleUniqueness(
+      const std::string& parent_resource_id,
+      const std::string& title,
+      const std::string& resource_id,
+      google_apis::ResourceEntry::ResourceEntryKind kind) {
     ScopedVector<ResourceEntry> entries;
     EXPECT_EQ(google_apis::HTTP_SUCCESS,
               fake_drive_helper_->SearchByTitle(
@@ -256,7 +257,7 @@ void APIUtilTest::TestCreateSyncRoot() {
   VerifyTitleUniqueness(std::string(),  // directory_resource_id
                         APIUtil::GetSyncRootDirectoryName(),
                         output.resource_id,
-                        google_apis::ENTRY_KIND_FOLDER);
+                        google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
 }
 
 void APIUtilTest::TestCreateSyncRoot_Conflict() {
@@ -274,7 +275,7 @@ void APIUtilTest::TestCreateSyncRoot_Conflict() {
   VerifyTitleUniqueness(std::string(),  // directory_resource_id
                         APIUtil::GetSyncRootDirectoryName(),
                         output.resource_id,
-                        google_apis::ENTRY_KIND_FOLDER);
+                        google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
 }
 
 void APIUtilTest::TestGetOriginDirectory() {
@@ -308,7 +309,7 @@ void APIUtilTest::TestCreateOriginDirectory() {
   VerifyTitleUniqueness(sync_root_id,
                         kOriginDirectoryName,
                         output.resource_id,
-                        google_apis::ENTRY_KIND_FOLDER);
+                        google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
 }
 
 void APIUtilTest::TestCreateOriginDirectory_Conflict() {
@@ -329,7 +330,7 @@ void APIUtilTest::TestCreateOriginDirectory_Conflict() {
   VerifyTitleUniqueness(sync_root_id,
                         kOriginDirectoryName,
                         output.resource_id,
-                        google_apis::ENTRY_KIND_FOLDER);
+                        google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
 }
 
 void APIUtilTest::TestGetLargestChangeStamp() {
@@ -482,7 +483,7 @@ void APIUtilTest::TestUploadNewFile() {
   VerifyTitleUniqueness(origin_root_id,
                         kFileTitle,
                         output.resource_id,
-                        google_apis::ENTRY_KIND_FILE);
+                        google_apis::ResourceEntry::ENTRY_KIND_FILE);
 }
 
 void APIUtilTest::TestUploadNewFile_ConflictWithFile() {
@@ -509,7 +510,7 @@ void APIUtilTest::TestUploadNewFile_ConflictWithFile() {
   VerifyTitleUniqueness(origin_root_id,
                         kFileTitle,
                         output.resource_id,
-                        google_apis::ENTRY_KIND_FILE);
+                        google_apis::ResourceEntry::ENTRY_KIND_FILE);
 }
 
 void APIUtilTest::TestUploadExistingFile() {
@@ -536,7 +537,7 @@ void APIUtilTest::TestUploadExistingFile() {
   VerifyTitleUniqueness(origin_root_id,
                         file->title(),
                         file->file_id(),
-                        google_apis::ENTRY_KIND_FILE);
+                        google_apis::ResourceEntry::ENTRY_KIND_FILE);
 }
 
 void APIUtilTest::TestUploadExistingFileInConflict() {
@@ -568,7 +569,7 @@ void APIUtilTest::TestUploadExistingFileInConflict() {
   VerifyTitleUniqueness(origin_root_id,
                         file->title(),
                         file->file_id(),
-                        google_apis::ENTRY_KIND_FILE);
+                        google_apis::ResourceEntry::ENTRY_KIND_FILE);
 }
 
 void APIUtilTest::TestDeleteFile() {
@@ -616,7 +617,7 @@ void APIUtilTest::TestDeleteFileInConflict() {
   VerifyTitleUniqueness(origin_root_id,
                         file->title(),
                         file->file_id(),
-                        google_apis::ENTRY_KIND_FILE);
+                        google_apis::ResourceEntry::ENTRY_KIND_FILE);
 }
 
 void APIUtilTest::TestCreateDirectory() {
@@ -637,7 +638,7 @@ void APIUtilTest::TestCreateDirectory() {
   VerifyTitleUniqueness(origin_root_id,
                         kDirectoryTitle,
                         output.resource_id,
-                        google_apis::ENTRY_KIND_FOLDER);
+                        google_apis::ResourceEntry::ENTRY_KIND_FOLDER);
 }
 
 TEST_F(APIUtilTest, GetSyncRoot) {