gdata: Define the resource ID for the root directory

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/utf_string_conversions.h"
 #include "base/platform_file.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/gdata/gdata.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_parser.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "net/base/escape.h"
 
 namespace gdata {
 namespace {
 
 const char kSlash[] = "/";
 const char kEscapedSlash[] = "\xE2\x88\x95";
-const FilePath::CharType kGDataRootDirectory[] = FILE_PATH_LITERAL("drive");
 
 std::string CacheSubDirectoryTypeToString(
     GDataRootDirectory::CacheSubDirectoryType subdir) {
   switch (subdir) {
     case GDataRootDirectory::CACHE_TYPE_META: return "meta";
     case GDataRootDirectory::CACHE_TYPE_PINNED: return "pinned";
     case GDataRootDirectory::CACHE_TYPE_OUTGOING: return "outgoing";
     case GDataRootDirectory::CACHE_TYPE_PERSISTENT: return "persistent";
     case GDataRootDirectory::CACHE_TYPE_TMP: return "tmp";
     case GDataRootDirectory::CACHE_TYPE_TMP_DOWNLOADS:
@@ skipping 392 matching lines @@
 }
 
 // GDataRootDirectory class implementation.
 
 GDataRootDirectory::GDataRootDirectory()
     : ALLOW_THIS_IN_INITIALIZER_LIST(GDataDirectory(NULL, this)),
       fake_search_directory_(new GDataDirectory(NULL, NULL)),
       largest_changestamp_(0), serialized_size_(0) {
   title_ = kGDataRootDirectory;
   SetFileNameFromTitle();
+  resource_id_ = kGDataRootDirectoryResourceId;
+  // Add self to the map so the root directory can be looked up by the
+  // resource ID.
+  AddEntryToResourceMap(this);
 }
 
 GDataRootDirectory::~GDataRootDirectory() {
   STLDeleteValues(&cache_map_);
   cache_map_.clear();
 
   resource_map_.clear();
 }
 
 GDataRootDirectory* GDataRootDirectory::AsGDataRootDirectory() {
@@ skipping 418 matching lines @@
 }
 
 bool GDataRootDirectory::ParseFromString(const std::string& serialized_proto) {
   scoped_ptr<GDataRootDirectoryProto> proto(
       new GDataRootDirectoryProto());
   bool ok = proto->ParseFromString(serialized_proto);
   if (ok) {
     // The title field for the root directory was originally empty, then
     // changed to "gdata", then changed to "drive". Discard the proto data if
     // the older formats are detected. See crbug.com/128133 for details.
-    const std::string& title = proto->gdata_directory().gdata_entry().title();
-    if (title != "drive") {
-      LOG(ERROR) << "Incompatible proto detected: " << title;
+    const GDataEntryProto& entry = proto->gdata_directory().gdata_entry();

[achuithb, 2012/05/18 17:42:56]

nit: maybe call this entry_proto?

[satorux1, 2012/05/18 17:55:28]

Done.

+    if (entry.title() != "drive") {
+      LOG(ERROR) << "Incompatible proto detected (bad title): "
+                 << entry.title();
+      return false;
+    }
+    if (entry.resource_id() != kGDataRootDirectoryResourceId) {
+      LOG(ERROR) << "Incompatible proto detected (bad resource id): "
+                 << entry.resource_id();
       return false;
     }
 
     FromProto(*proto.get());
     set_origin(FROM_CACHE);
     set_refresh_time(base::Time::Now());
   }
   return ok;
 }
 
 }  // namespace gdata