Get rid of DriveEntryKind.

chrome/browser/chromeos/drive/resource_entry_conversion.cc

 // Copyright (c) 2012 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/chromeos/drive/resource_entry_conversion.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/drive/drive_api_util.h"
 #include "google_apis/drive/drive_api_parser.h"
-#include "google_apis/drive/gdata_wapi_parser.h"
 
 namespace drive {
 
 bool ConvertChangeResourceToResourceEntry(
     const google_apis::ChangeResource& input,
     ResourceEntry* out_entry,
     std::string* out_parent_resource_id) {
   DCHECK(out_entry);
   DCHECK(out_parent_resource_id);
 
@@ skipping 44 matching lines @@
   PlatformFileInfoProto* file_info = converted.mutable_file_info();
 
   file_info->set_last_modified(input.modified_date().ToInternalValue());
   // If the file has never been viewed (last_viewed_by_me_date().is_null() ==
   // true), then we will set the last_accessed field in the protocol buffer to
   // 0.
   file_info->set_last_accessed(
       input.last_viewed_by_me_date().ToInternalValue());
   file_info->set_creation_time(input.created_date().ToInternalValue());
 
-  // TODO(hashimoto): Get rid of WAPI stuff. crbug.com/357038
-  const google_apis::DriveEntryKind entry_kind = util::GetKind(input);
-  const int entry_kind_class =
-      google_apis::ResourceEntry::ClassifyEntryKind(entry_kind);
-  const bool is_file = entry_kind_class &
-      google_apis::ResourceEntry::KIND_OF_FILE;
-  const bool is_hosted_document = entry_kind_class &
-      google_apis::ResourceEntry::KIND_OF_HOSTED_DOCUMENT;
-  const bool is_folder = entry_kind_class &
-      google_apis::ResourceEntry::KIND_OF_FOLDER;
+  const bool is_folder = input.IsDirectory();
+  const bool is_hosted_document =
+      drive::util::IsHostedDocument(input.mime_type());
+  const bool is_file = !is_folder && !is_hosted_document;

[hashimoto, 2014/07/14 08:23:26]

nit: No need to have this bool now?

[fukino, 2014/07/14 09:10:53]

Done. Removed these temporary bool variables.

 
   if (is_file || is_hosted_document) {
     FileSpecificInfo* file_specific_info =
         converted.mutable_file_specific_info();
     if (is_file) {
       file_info->set_size(input.file_size());
       file_specific_info->set_md5(input.md5_checksum());
     } else if (is_hosted_document) {
       // Attach .g<something> extension to hosted documents so we can special
       // case their handling in UI.
       // TODO(satorux): Figure out better way how to pass input info like kind
       // to UI through the File API stack.
       const std::string document_extension =
-          google_apis::ResourceEntry::GetHostedDocumentExtension(entry_kind);
+          drive::util::GetHostedDocumentExtension(input.mime_type());
       file_specific_info->set_document_extension(document_extension);
       converted.set_base_name(
           util::NormalizeFileName(converted.title() + document_extension));
 
       // We don't know the size of hosted docs and it does not matter since
       // it has no effect on the quota.
       file_info->set_size(0);
     }
     file_info->set_is_directory(false);
     file_specific_info->set_content_mime_type(input.mime_type());
     file_specific_info->set_is_hosted_document(is_hosted_document);
 
     if (!input.alternate_link().is_empty())
       file_specific_info->set_alternate_url(input.alternate_link().spec());
 
     const int64 image_width = input.image_media_metadata().width();
     if (image_width != -1)
       file_specific_info->set_image_width(image_width);
 
     const int64 image_height = input.image_media_metadata().height();
     if (image_height != -1)
       file_specific_info->set_image_height(image_height);
 
     const int64 image_rotation = input.image_media_metadata().rotation();
     if (image_rotation != -1)
       file_specific_info->set_image_rotation(image_rotation);
   } else if (is_folder) {
     file_info->set_is_directory(true);
   } else {
     // The entry is something that doesn't map into files (i.e. sites).

[hashimoto, 2014/07/14 08:23:26]

This branch is never reached.

[fukino, 2014/07/14 09:10:53]

Done.

     // We don't handle these kind of entries hence return false.
     return false;
   }
 
   out_entry->Swap(&converted);
   swap(*out_parent_resource_id, parent_resource_id);
   return true;
 }
 
 void ConvertResourceEntryToFileInfo(const ResourceEntry& entry,
                                     base::File::Info* file_info) {
   file_info->size = entry.file_info().size();
   file_info->is_directory = entry.file_info().is_directory();
   file_info->is_symbolic_link = entry.file_info().is_symbolic_link();
   file_info->last_modified = base::Time::FromInternalValue(
       entry.file_info().last_modified());
   file_info->last_accessed = base::Time::FromInternalValue(
       entry.file_info().last_accessed());
   file_info->creation_time = base::Time::FromInternalValue(
       entry.file_info().creation_time());
 }
 
 }  // namespace drive