Get rid of DriveEntryKind.

google_apis/drive/gdata_wapi_parser.h

 // 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.
 
 #ifndef GOOGLE_APIS_DRIVE_GDATA_WAPI_PARSER_H_
 #define GOOGLE_APIS_DRIVE_GDATA_WAPI_PARSER_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_piece.h"
 #include "base/time/time.h"
-#include "google_apis/drive/drive_entry_kinds.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
 class DictionaryValue;
 class Value;
 
 template <class StructType>
 class JSONValueConverter;
 
@@ skipping 277 matching lines @@
   ScopedVector<Category> categories_;
   base::Time updated_time_;
 
   DISALLOW_COPY_AND_ASSIGN(CommonMetadata);
 };
 
 // This class represents a resource entry. A resource is a generic term which
 // refers to a file and a directory.
 class ResourceEntry : public CommonMetadata {
  public:
+  enum ResourceEntryKind {
+    ENTRY_KIND_UNKNOWN,
+    ENTRY_KIND_FOLDER,
+    ENTRY_KIND_FILE
+  };
   ResourceEntry();
   virtual ~ResourceEntry();
 
   // Extracts "entry" dictionary from the JSON value, and parse the contents,
   // using CreateFrom(). Returns NULL on failure. The input JSON data, coming
   // from the gdata server, looks like:
   //
   // {
   //   "encoding": "UTF-8",
   //   "entry": { ... },   // This function will extract this and parse.
@@ skipping 28 matching lines @@
 
   // The resource ID is used to identify a resource, which looks like:
   // file:d41d8cd98f00b204e9800998ecf8
   const std::string& resource_id() const { return resource_id_; }
 
   // This is a URL looks like:
   // https://docs.google.com/feeds/id/file%3Ad41d8cd98f00b204e9800998ecf8.
   // The URL is currently not used.
   const std::string& id() const { return id_; }
 
-  DriveEntryKind kind() const { return kind_; }
+  ResourceEntryKind kind() const { return kind_; }
   const std::string& title() const { return title_; }
   base::Time published_time() const { return published_time_; }
   base::Time last_viewed_time() const { return last_viewed_time_; }
   const std::vector<std::string>& labels() const { return labels_; }
 
   // The URL to download a file content.
   // Search for 'download_url' in gdata_wapi_requests.h for details.
   const GURL& download_url() const { return content_.url(); }
 
   const std::string& content_mime_type() const { return content_.mime_type(); }
@@ skipping 37 matching lines @@
   int64 image_rotation() const { return image_rotation_; }
 
   // The time of this modification.
   // Note: This property is filled only when converted from ChangeResource.
   const base::Time& modification_date() const { return modification_date_; }
 
   // Text version of resource entry kind. Returns an empty string for
   // unknown entry kind.
   std::string GetEntryKindText() const;
 
-  // Returns preferred file extension for hosted documents. If entry is not
-  // a hosted document, this call returns an empty string.
-  static std::string GetHostedDocumentExtension(DriveEntryKind kind);
-
-  // True if resource entry is remotely hosted.
-  bool is_hosted_document() const {
-    return (ClassifyEntryKind(kind_) & KIND_OF_HOSTED_DOCUMENT) > 0;
-  }
-  // True if resource entry hosted by Google Documents.
-  bool is_google_document() const {
-    return (ClassifyEntryKind(kind_) & KIND_OF_GOOGLE_DOCUMENT) > 0;
-  }
-  // True if resource entry is hosted by an external application.
-  bool is_external_document() const {
-    return (ClassifyEntryKind(kind_) & KIND_OF_EXTERNAL_DOCUMENT) > 0;
-  }
   // True if resource entry is a folder (collection).
   bool is_folder() const {
-    return (ClassifyEntryKind(kind_) & KIND_OF_FOLDER) > 0;
+    return kind_ == ENTRY_KIND_FOLDER;
   }
   // True if resource entry is regular file.
   bool is_file() const {
-    return (ClassifyEntryKind(kind_) & KIND_OF_FILE) > 0;
+    return kind_ == ENTRY_KIND_FILE;
   }
-  // True if resource entry can't be mapped to the file system.
-  bool is_special() const {
-    return !is_file() && !is_folder() && !is_hosted_document();
-  }
-
-  // The following constructs are exposed for unit tests.
-
-  // Classes of EntryKind. Used for ClassifyEntryKind().
-  enum EntryKindClass {
-    KIND_OF_NONE = 0,
-    KIND_OF_HOSTED_DOCUMENT = 1,
-    KIND_OF_GOOGLE_DOCUMENT = 1 << 1,
-    KIND_OF_EXTERNAL_DOCUMENT = 1 << 2,
-    KIND_OF_FOLDER = 1 << 3,
-    KIND_OF_FILE = 1 << 4,
-  };
-
-  // Returns the kind enum corresponding to the extension in form ".xxx".
-  static DriveEntryKind GetEntryKindFromExtension(const std::string& extension);
-
-  // Classifies the EntryKind. The returned value is a bitmask of
-  // EntryKindClass. For example, DOCUMENT is classified as
-  // KIND_OF_HOSTED_DOCUMENT and KIND_OF_GOOGLE_DOCUMENT, hence the returned
-  // value is KIND_OF_HOSTED_DOCUMENT | KIND_OF_GOOGLE_DOCUMENT.
-  static int ClassifyEntryKind(DriveEntryKind kind);
-
-  // Classifies the EntryKind by the file extension of specific path. The
-  // returned value is a bitmask of EntryKindClass. See also ClassifyEntryKind.
-  static int ClassifyEntryKindByFileExtension(const base::FilePath& file);
 
   void set_resource_id(const std::string& resource_id) {
     resource_id_ = resource_id;
   }
   void set_id(const std::string& id) { id_ = id; }
-  void set_kind(DriveEntryKind kind) { kind_ = kind; }
+  void set_kind(ResourceEntryKind kind) { kind_ = kind; }
   void set_title(const std::string& title) { title_ = title; }
   void set_published_time(const base::Time& published_time) {
     published_time_ = published_time;
   }
   void set_last_viewed_time(const base::Time& last_viewed_time) {
     last_viewed_time_ = last_viewed_time;
   }
   void set_labels(const std::vector<std::string>& labels) {
     labels_ = labels;
   }
@@ skipping 24 matching lines @@
   // Fills the remaining fields where JSONValueConverter cannot catch.
   // Currently, sets |kind_| and |labels_| based on the |categories_| in the
   // class.
   void FillRemainingFields();
 
  private:
   friend class base::internal::RepeatedMessageConverter<ResourceEntry>;
   friend class ResourceList;
   friend class ResumeUploadRequest;
 
-  // Converts categories.term into DriveEntryKind enum.
-  static DriveEntryKind GetEntryKindFromTerm(const std::string& term);
-  // Converts |kind| into its text identifier equivalent.
-  static const char* GetEntryKindDescription(DriveEntryKind kind);
+  // Converts categories.term into ResourceEntryKind enum.
+  static ResourceEntryKind GetEntryKindFromTerm(const std::string& term);
 
   std::string resource_id_;
   std::string id_;
-  DriveEntryKind kind_;
+  ResourceEntryKind kind_;
   std::string title_;
   base::Time published_time_;
   // Last viewed value may be unreliable. See: crbug.com/152628.
   base::Time last_viewed_time_;
   std::vector<std::string> labels_;
   Content content_;
   ScopedVector<ResourceLink> resource_links_;
   // Optional fields for files only.
   std::string filename_;
   std::string suggested_filename_;
@@ skipping 94 matching lines @@
   int items_per_page_;
   std::string title_;
   int64 largest_changestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceList);
 };
 
 }  // namespace google_apis
 
 #endif  // GOOGLE_APIS_DRIVE_GDATA_WAPI_PARSER_H_