Get AboutResource as account metadata for Drive V2.

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 <leveldb/db.h>
 #include <vector>
 
 #include "base/message_loop_proxy.h"
@@ skipping 296 matching lines @@
                                                    ++max_modifier));
     }
   }
   entry->set_base_name(full_file_name.value());
 
   DVLOG(1) << "AddEntry: dir = " << GetFilePath().value()
            << ", file = " + entry->base_name()
            << ", parent resource = " << entry->parent_resource_id()
            << ", resource = " + entry->resource_id();
 
-
   // Add entry to resource map.
   if (directory_service_)
     directory_service_->AddEntryToResourceMap(entry);
 
   // Setup child and parent links.
   AddChild(entry);
   entry->SetParent(this);
 }
 
 bool GDataDirectory::TakeEntry(GDataEntry* entry) {
@@ skipping 217 matching lines @@
 
 // GDataDirectoryService class implementation.
 
 GDataDirectoryService::GDataDirectoryService()
     : blocking_task_runner_(NULL),
       serialized_size_(0),
       largest_changestamp_(0),
       origin_(UNINITIALIZED),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   root_.reset(new GDataDirectory(NULL, this));
-  root_->set_title(kGDataRootDirectory);
-  root_->SetBaseNameFromTitle();
-  root_->set_resource_id(kGDataRootDirectoryResourceId);
-  AddEntryToResourceMap(root_.get());
+  if (!util::IsDriveV2ApiEnabled())
+    SetRootResourceId(kGDataRootDirectoryResourceId);

[satorux1, 2012/08/08 13:18:51]

The function name looks wrong. Here, we are doing more than setting the resource
id. Maybe we don't need to introduce a function for this?

if (!util::IsDriveV2ApiEnabled()) {
   ...
}

[kochi, 2012/08/08 16:53:27]

Nope, I introduced the function as Drive v2 uses a unique ID for root
(not a fixed string) and we have to set the resource ID after we get
the id in About resource.

InitializeRootEntry(resource_id) sound good to you?

 }
 
 GDataDirectoryService::~GDataDirectoryService() {
   ClearRoot();
 
   // Ensure db is closed on the blocking pool.
   if (blocking_task_runner_ && directory_service_db_.get())
     blocking_task_runner_->DeleteSoon(FROM_HERE,
                                       directory_service_db_.release());
 }
 
+void GDataDirectoryService::SetRootResourceId(const std::string& root_id) {
+  root_.reset(new GDataDirectory(NULL, this));
+  root_->set_title(kGDataRootDirectory);
+  root_->SetBaseNameFromTitle();
+  root_->set_resource_id(root_id);
+  AddEntryToResourceMap(root_.get());
+}
+
 void GDataDirectoryService::ClearRoot() {
   // Note that children have a reference to root_,
   // so we need to delete them here.
   root_->RemoveChildren();
   RemoveEntryFromResourceMap(root_.get());
   DCHECK(resource_map_.empty());
   resource_map_.clear();
   root_.reset();
 }
 
@@ skipping 152 matching lines @@
       version != kProtoVersion) {
     if (!callback.is_null())
       callback.Run(GDATA_FILE_ERROR_FAILED);
     return;
   }
   serialized_resources->erase(iter);
 
   // Get the largest changestamp.
   iter = serialized_resources->find(kDBKeyLargestChangestamp);
   if (iter == serialized_resources->end() ||
-      !base::StringToInt(iter->second, &largest_changestamp_)) {
+      !base::StringToInt64(iter->second, &largest_changestamp_)) {
     NOTREACHED() << "Could not find/parse largest_changestamp";
     if (!callback.is_null())
       callback.Run(GDATA_FILE_ERROR_FAILED);
     return;
   } else {
     DVLOG(1) << "InitResourceMap largest_changestamp_" << largest_changestamp_;
     serialized_resources->erase(iter);
   }
 
   ResourceMap resource_map;
@@ skipping 285 matching lines @@
     return false;
   }
 
   if (!IsValidRootDirectoryProto(proto.gdata_directory()))
     return false;
 
   if (!root_->FromProto(proto.gdata_directory()))
     return false;
 
   origin_ = FROM_CACHE;
   largest_changestamp_ = proto.largest_changestamp();

[satorux1, 2012/08/08 13:18:51]

Because you made an incompatible change in gdata.proto,
proto.largest_changestamp() will be 0 if you read an existing proto file, right?

We should reject an existing proto file if you make an incompatible change.
Please increment the kProtoVersion in gdata_files.h.

[kochi, 2012/08/08 16:53:27]

Done.

 
   return true;
 }
 
 scoped_ptr<GDataEntry> GDataDirectoryService::FromProtoString(
     const std::string& serialized_proto) {
   GDataEntryProto entry_proto;
   if (!entry_proto.ParseFromString(serialized_proto))
     return scoped_ptr<GDataEntry>();
 
@@ skipping 12 matching lines @@
     if (file->FromProto(entry_proto)) {
       entry.reset(file.release());
     } else {
       NOTREACHED() << "FromProto (file) failed";
     }
   }
   return entry.Pass();
 }
 
 }  // namespace gdata