gdata: Remove logic to detect incompatibility proto

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 "base/platform_file.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 362 matching lines @@
     const base::PlatformFileInfo& file_info,
     PlatformFileInfoProto* proto) {
   proto->set_size(file_info.size);
   proto->set_is_directory(file_info.is_directory);
   proto->set_is_symbolic_link(file_info.is_symbolic_link);
   proto->set_last_modified(file_info.last_modified.ToInternalValue());
   proto->set_last_accessed(file_info.last_accessed.ToInternalValue());
   proto->set_creation_time(file_info.creation_time.ToInternalValue());
 }
 
-bool GDataEntry::FromProto(const GDataEntryProto& proto) {
+void GDataEntry::FromProto(const GDataEntryProto& proto) {
   ConvertProtoToPlatformFileInfo(proto.file_info(), &file_info_);
 
   // Don't copy from proto.base_name() as base_name_ is computed in
   // SetBaseNameFromTitle().
   title_ = proto.title();
   resource_id_ = proto.resource_id();
   parent_resource_id_ = proto.parent_resource_id();
   edit_url_ = GURL(proto.edit_url());
   content_url_ = GURL(proto.content_url());
   upload_url_ = GURL(proto.upload_url());
   SetBaseNameFromTitle();
-
-  // Reject older protobuf that does not contain the upload URL.  This URL is
-  // necessary for uploading files.
-  if (!proto.has_upload_url()) {
-    LOG(ERROR) << "Incompatible proto detected (no upload URL): "
-               << proto.title();
-    return false;
-  }
-
-  return true;
 }
 
 void GDataEntry::ToProto(GDataEntryProto* proto) const {
   ConvertPlatformFileInfoToProto(file_info_, proto->mutable_file_info());
 
   // The base_name field is used in GetFileInfoByPathAsync(). As shown in
   // FromProto(), the value is discarded when deserializing from proto.
   proto->set_base_name(base_name_);
   proto->set_title(title_);
   proto->set_resource_id(resource_id_);
   proto->set_parent_resource_id(parent_resource_id_);
   proto->set_edit_url(edit_url_.spec());
   proto->set_content_url(content_url_.spec());
   proto->set_upload_url(upload_url_.spec());
 }
 
 void GDataEntry::ToProtoFull(GDataEntryProto* proto) const {
   if (AsGDataFileConst()) {
     AsGDataFileConst()->ToProto(proto);
   } else if (AsGDataDirectoryConst()) {
     // Unlike files, directories don't have directory specific info, so just
     // calling GDataEntry::ToProto().
     ToProto(proto);
   } else {
     NOTREACHED();
   }
 }
 
-bool GDataFile::FromProto(const GDataEntryProto& proto) {
+void GDataFile::FromProto(const GDataEntryProto& proto) {
   DCHECK(!proto.file_info().is_directory());
 
-  if (!GDataEntry::FromProto(proto))
-    return false;
+  GDataEntry::FromProto(proto);
 
   thumbnail_url_ = GURL(proto.file_specific_info().thumbnail_url());
   alternate_url_ = GURL(proto.file_specific_info().alternate_url());
   content_mime_type_ = proto.file_specific_info().content_mime_type();
   file_md5_ = proto.file_specific_info().file_md5();
   document_extension_ = proto.file_specific_info().document_extension();
   is_hosted_document_ = proto.file_specific_info().is_hosted_document();
-
-  return true;
 }
 
 void GDataFile::ToProto(GDataEntryProto* proto) const {
   GDataEntry::ToProto(proto);
   DCHECK(!proto->file_info().is_directory());
   GDataFileSpecificInfo* file_specific_info =
       proto->mutable_file_specific_info();
   file_specific_info->set_thumbnail_url(thumbnail_url_.spec());
   file_specific_info->set_alternate_url(alternate_url_.spec());
   file_specific_info->set_content_mime_type(content_mime_type_);
   file_specific_info->set_file_md5(file_md5_);
   file_specific_info->set_document_extension(document_extension_);
   file_specific_info->set_is_hosted_document(is_hosted_document_);
 }
 
-bool GDataDirectory::FromProto(const GDataDirectoryProto& proto) {
+void GDataDirectory::FromProto(const GDataDirectoryProto& proto) {
   DCHECK(proto.gdata_entry().file_info().is_directory());
   DCHECK(!proto.gdata_entry().has_file_specific_info());
 
   for (int i = 0; i < proto.child_files_size(); ++i) {
     scoped_ptr<GDataFile> file(directory_service_->CreateGDataFile());
-    if (!file->FromProto(proto.child_files(i))) {
-      RemoveChildren();
-      return false;
-    }
+    file->FromProto(proto.child_files(i));
     AddEntry(file.release());
   }
   for (int i = 0; i < proto.child_directories_size(); ++i) {
     scoped_ptr<GDataDirectory> dir(directory_service_->CreateGDataDirectory());
-    if (!dir->FromProto(proto.child_directories(i))) {
-      RemoveChildren();
-      return false;
-    }
+    dir->FromProto(proto.child_directories(i));
     AddEntry(dir.release());
   }
 
   // The states of the directory should be updated after children are
   // handled successfully, so that incomplete states are not left.
-  if (!GDataEntry::FromProto(proto.gdata_entry()))
-    return false;
-
-  return true;
+  GDataEntry::FromProto(proto.gdata_entry());
 }
 
 void GDataDirectory::ToProto(GDataDirectoryProto* proto) const {
   GDataEntry::ToProto(proto->mutable_gdata_entry());
   DCHECK(proto->gdata_entry().file_info().is_directory());
 
   for (GDataFileCollection::const_iterator iter = child_files_.begin();
        iter != child_files_.end(); ++iter) {
     GDataFile* file = iter->second;
     file->ToProto(proto->add_child_files());
@@ skipping 37 matching lines @@
     DCHECK(ok);
   } else if (dir) {
     GDataDirectoryProto dir_proto;
     dir->ToProto(&dir_proto);
     const bool ok = dir_proto.SerializeToString(serialized_proto);
     DCHECK(ok);
   }
 }
 
 }  // namespace gdata