[SyncFS] Rename kind() to file_kind

chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 
 #include "base/bind.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 37 matching lines @@
 
   std::set<std::string> parents;
   for (int i = 0; i < left->parent_folder_ids_size(); ++i)
     EXPECT_TRUE(parents.insert(left->parent_folder_ids(i)).second);
 
   for (int i = 0; i < right->parent_folder_ids_size(); ++i)
     EXPECT_EQ(1u, parents.erase(left->parent_folder_ids(i)));
   EXPECT_TRUE(parents.empty());
 
   EXPECT_EQ(left->title(), right->title());
-  EXPECT_EQ(left->kind(), right->kind());
+  EXPECT_EQ(left->file_kind(), right->file_kind());
   EXPECT_EQ(left->md5(), right->md5());
   EXPECT_EQ(left->etag(), right->etag());
   EXPECT_EQ(left->creation_time(), right->creation_time());
   EXPECT_EQ(left->modification_time(), right->modification_time());
   EXPECT_EQ(left->deleted(), right->deleted());
   EXPECT_EQ(left->change_id(), right->change_id());
 }
 
 void ExpectEquivalent(const FileMetadata* left, const FileMetadata* right) {
   if (!left) {
@@ skipping 171 matching lines @@
     std::string value;
     ASSERT_TRUE(service_metadata.SerializeToString(&value));
     db->Put(leveldb::WriteOptions(), "SERVICE", value);
   }
 
   FileMetadata CreateSyncRootMetadata() {
     FileMetadata sync_root;
     sync_root.set_file_id(kSyncRootFolderID);
     FileDetails* details = sync_root.mutable_details();
     details->set_title("Chrome Syncable FileSystem");
-    details->set_kind(KIND_FOLDER);
+    details->set_file_kind(FILE_KIND_FOLDER);
     return sync_root;
   }
 
   FileMetadata CreateFileMetadata(const FileMetadata& parent,
                                   const std::string& title) {
     FileMetadata file;
     file.set_file_id(GenerateFileID());
     FileDetails* details = file.mutable_details();
     details->add_parent_folder_ids(parent.file_id());
     details->set_title(title);
-    details->set_kind(KIND_FILE);
+    details->set_file_kind(FILE_KIND_FILE);
     details->set_md5(
         "md5_value_" + base::Int64ToString(next_md5_sequence_number_++));
     return file;
   }
 
   FileMetadata CreateFolderMetadata(const FileMetadata& parent,
                                     const std::string& title) {
     FileMetadata folder;
     folder.set_file_id(GenerateFileID());
     FileDetails* details = folder.mutable_details();
     details->add_parent_folder_ids(parent.file_id());
     details->set_title(title);
-    details->set_kind(KIND_FOLDER);
+    details->set_file_kind(FILE_KIND_FOLDER);
     return folder;
   }
 
   FileTracker CreateSyncRootTracker(const FileMetadata& sync_root) {
     FileTracker sync_root_tracker;
     sync_root_tracker.set_tracker_id(kSyncRootTrackerID);
     sync_root_tracker.set_parent_tracker_id(0);
     sync_root_tracker.set_file_id(sync_root.file_id());
     sync_root_tracker.set_dirty(false);
     sync_root_tracker.set_active(true);
@@ skipping 33 matching lines @@
     for (int i = 0; i < file.details().parent_folder_ids_size(); ++i) {
       scoped_ptr<google_apis::ParentReference> parent(
           new google_apis::ParentReference);
       parent->set_file_id(file.details().parent_folder_ids(i));
       parents.push_back(parent.release());
     }
 
     file_resource->set_file_id(file.file_id());
     file_resource->set_parents(&parents);
     file_resource->set_title(file.details().title());
-    if (file.details().kind() == KIND_FOLDER)
+    if (file.details().file_kind() == FILE_KIND_FOLDER)
       file_resource->set_mime_type("application/vnd.google-apps.folder");
-    else if (file.details().kind() == KIND_FILE)
+    else if (file.details().file_kind() == FILE_KIND_FILE)
       file_resource->set_mime_type("text/plain");
     else
       file_resource->set_mime_type("application/vnd.google-apps.document");
     file_resource->set_md5_checksum(file.details().md5());
     file_resource->set_etag(file.details().etag());
     file_resource->set_created_date(base::Time::FromInternalValue(
         file.details().creation_time()));
     file_resource->set_modified_date(base::Time::FromInternalValue(
         file.details().modification_time()));
 
@@ skipping 485 matching lines @@
   VerifyFile(noop_file);
   VerifyTracker(noop_file_tracker);
   VerifyFile(new_file);
   VerifyTracker(new_file_tracker);
 
   VerifyReloadConsistency();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system