Revert 133815 - GDataDB support with leveldb.

chrome/browser/chromeos/gdata/gdata_files.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/gdata/gdata_files.h"
 
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "base/platform_file.h"
@@ skipping 60 matching lines @@
 }
 
 GDataDirectory* GDataEntry::AsGDataDirectory() {
   return NULL;
 }
 
 GDataRootDirectory* GDataEntry::AsGDataRootDirectory() {
   return NULL;
 }
 
-const GDataFile* GDataEntry::AsGDataFileConst() const {
-  // cast away const and call the non-const version. This is safe.
-  return const_cast<GDataEntry*>(this)->AsGDataFile();
-}
-
-const GDataDirectory* GDataEntry::AsGDataDirectoryConst() const {
-  // cast away const and call the non-const version. This is safe.
-  return const_cast<GDataEntry*>(this)->AsGDataDirectory();
-}
-
-FilePath GDataEntry::GetFilePath() const {
+FilePath GDataEntry::GetFilePath() {
   FilePath path;
   std::vector<FilePath::StringType> parts;
-  for (const GDataEntry* entry = this; entry != NULL; entry = entry->parent_)
+  for (GDataEntry* entry = this; entry != NULL; entry = entry->parent())
     parts.push_back(entry->file_name());
 
   // Paste paths parts back together in reverse order from upward tree
   // traversal.
   for (std::vector<FilePath::StringType>::reverse_iterator iter =
            parts.rbegin();
        iter != parts.rend(); ++iter) {
     path = path.Append(*iter);
   }
   return path;
@@ skipping 31 matching lines @@
   ReplaceSubstringsAfterOffset(&output, 0, std::string(kEscapedSlash), kSlash);
   return output;
 }
 
 // GDataFile class implementation.
 
 GDataFile::GDataFile(GDataDirectory* parent, GDataRootDirectory* root)
     : GDataEntry(parent, root),
       kind_(gdata::DocumentEntry::UNKNOWN),
       is_hosted_document_(false) {
-  file_info_.is_directory = false;
 }
 
 GDataFile::~GDataFile() {
 }
 
 GDataFile* GDataFile::AsGDataFile() {
   return this;
 }
 
 void GDataFile::SetFileNameFromTitle() {
@@ skipping 428 matching lines @@
       file_info_.creation_time.ToInternalValue());
 
   proto->set_file_name(file_name_);
   proto->set_title(title_);
   proto->set_resource_id(resource_id_);
   proto->set_edit_url(edit_url_.spec());
   proto->set_content_url(content_url_.spec());
 }
 
 void GDataFile::FromProto(const GDataFileProto& proto) {
-  DCHECK(!proto.gdata_entry().file_info().is_directory());
   GDataEntry::FromProto(proto.gdata_entry());
   kind_ = DocumentEntry::EntryKind(proto.kind());
   thumbnail_url_ = GURL(proto.thumbnail_url());
   alternate_url_ = GURL(proto.alternate_url());
   content_mime_type_ = proto.content_mime_type();
   etag_ = proto.etag();
   id_ = proto.id();
   file_md5_ = proto.file_md5();
   document_extension_ = proto.document_extension();
   is_hosted_document_ = proto.is_hosted_document();
 }
 
 void GDataFile::ToProto(GDataFileProto* proto) const {
   GDataEntry::ToProto(proto->mutable_gdata_entry());
-  DCHECK(!proto->gdata_entry().file_info().is_directory());
   proto->set_kind(kind_);
   proto->set_thumbnail_url(thumbnail_url_.spec());
   proto->set_alternate_url(alternate_url_.spec());
   proto->set_content_mime_type(content_mime_type_);
   proto->set_etag(etag_);
   proto->set_id(id_);
   proto->set_file_md5(file_md5_);
   proto->set_document_extension(document_extension_);
   proto->set_is_hosted_document(is_hosted_document_);
 }
 
 void GDataDirectory::FromProto(const GDataDirectoryProto& proto) {
-  DCHECK(proto.gdata_entry().file_info().is_directory());
   GDataEntry::FromProto(proto.gdata_entry());
   refresh_time_ = base::Time::FromInternalValue(proto.refresh_time());
   start_feed_url_ = GURL(proto.start_feed_url());
   next_feed_url_ = GURL(proto.next_feed_url());
   upload_url_ = GURL(proto.upload_url());
   origin_ = ContentOrigin(proto.origin());
   for (int i = 0; i < proto.child_files_size(); ++i) {
     scoped_ptr<GDataFile> file(new GDataFile(this, root_));
     file->FromProto(proto.child_files(i));
     AddEntry(file.release());
   }
   for (int i = 0; i < proto.child_directories_size(); ++i) {
     scoped_ptr<GDataDirectory> dir(new GDataDirectory(this, root_));
     dir->FromProto(proto.child_directories(i));
     AddEntry(dir.release());
   }
 }
 
 void GDataDirectory::ToProto(GDataDirectoryProto* proto) const {
   GDataEntry::ToProto(proto->mutable_gdata_entry());
-  DCHECK(proto->gdata_entry().file_info().is_directory());
   proto->set_refresh_time(refresh_time_.ToInternalValue());
   proto->set_start_feed_url(start_feed_url_.spec());
   proto->set_next_feed_url(next_feed_url_.spec());
   proto->set_upload_url(upload_url_.spec());
   proto->set_origin(origin_);
   for (GDataFileCollection::const_iterator iter = children_.begin();
        iter != children_.end(); ++iter) {
     GDataFile* file = iter->second->AsGDataFile();
     GDataDirectory* dir = iter->second->AsGDataDirectory();
     if (file)
       file->ToProto(proto->add_child_files());
     if (dir)
       dir->ToProto(proto->add_child_directories());
   }
 }
 
 void GDataRootDirectory::FromProto(const GDataRootDirectoryProto& proto) {
   root_ = this;
   GDataDirectory::FromProto(proto.gdata_directory());
   largest_changestamp_ = proto.largest_changestamp();
 }
 
 void GDataRootDirectory::ToProto(GDataRootDirectoryProto* proto) const {
   GDataDirectory::ToProto(proto->mutable_gdata_directory());
   proto->set_largest_changestamp(largest_changestamp_);
 }
 
-void GDataEntry::SerializeToString(std::string* serialized_proto) const {
-  const GDataFile* file = AsGDataFileConst();
-  const GDataDirectory* dir = AsGDataDirectoryConst();
-
-  if (file) {
-    scoped_ptr<GDataFileProto> proto(new GDataFileProto());
-    file->ToProto(proto.get());
-    const bool ok = proto->SerializeToString(serialized_proto);
-    DCHECK(ok);
-  } else if (dir) {
-    scoped_ptr<GDataDirectoryProto> proto(new GDataDirectoryProto());
-    dir->ToProto(proto.get());
-    const bool ok = proto->SerializeToString(serialized_proto);
-    DCHECK(ok);
-  }
-}
-
-// static
-scoped_ptr<GDataEntry> GDataEntry::FromProtoString(
-    const std::string& serialized_proto) {
-  // First try to parse as GDataDirectoryProto. Note that this can succeed for
-  // a serialized_proto that's really a GDataFileProto - we have to check
-  // is_directory to be sure.
-  scoped_ptr<GDataDirectoryProto> dir_proto(new GDataDirectoryProto());
-  bool ok = dir_proto->ParseFromString(serialized_proto);
-  if (ok && dir_proto->gdata_entry().file_info().is_directory()) {
-    GDataDirectory* dir = new GDataDirectory(NULL, NULL);
-    dir->FromProto(*dir_proto);
-    return scoped_ptr<GDataEntry>(dir);
-  }
-
-  scoped_ptr<GDataFileProto> file_proto(new GDataFileProto());
-  ok = file_proto->ParseFromString(serialized_proto);
-  if (ok) {
-    DCHECK(!file_proto->gdata_entry().file_info().is_directory());
-    GDataFile* file = new GDataFile(NULL, NULL);
-    file->FromProto(*file_proto);
-    return scoped_ptr<GDataEntry>(file);
-  }
-  return scoped_ptr<GDataEntry>(NULL);
-}
-
-void GDataRootDirectory::SerializeToString(
-    std::string* serialized_proto) const {
+void GDataRootDirectory::SerializeToString(std::string* proto_string) const {
   scoped_ptr<GDataRootDirectoryProto> proto(
       new GDataRootDirectoryProto());
   ToProto(proto.get());
-  const bool ok = proto->SerializeToString(serialized_proto);
+  const bool ok = proto->SerializeToString(proto_string);
   DCHECK(ok);
 }
 
-bool GDataRootDirectory::ParseFromString(const std::string& serialized_proto) {
+bool GDataRootDirectory::ParseFromString(const std::string& proto_string) {
   scoped_ptr<GDataRootDirectoryProto> proto(
       new GDataRootDirectoryProto());
-  bool ok = proto->ParseFromString(serialized_proto);
+  bool ok = proto->ParseFromString(proto_string);
   if (ok) {
     FromProto(*proto.get());
     set_origin(FROM_CACHE);
     set_refresh_time(base::Time::Now());
   }
   return ok;
 }
 
 }  // namespace gdata