sync: Make BaseNode lookup-related Init functions return specific failures.

chrome/browser/sync/glue/theme_model_associator.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/sync/glue/theme_model_associator.h"
 
 #include "base/basictypes.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
@@ skipping 26 matching lines @@
     : sync_service_(sync_service),
       error_handler_(error_handler) {
   DCHECK(sync_service_);
 }
 
 ThemeModelAssociator::~ThemeModelAssociator() {}
 
 SyncError ThemeModelAssociator::AssociateModels() {
   sync_api::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   sync_api::ReadNode root(&trans);
-  if (!root.InitByTagLookup(kThemesTag)) {
+  if (root.InitByTagLookup(kThemesTag) != sync_api::BaseNode::INIT_OK) {
     return error_handler_->CreateAndUploadError(FROM_HERE,
                                                 kNoThemesFolderError,
                                                 model_type());
   }
 
   Profile* profile = sync_service_->profile();
   sync_api::WriteNode node(&trans);
   // TODO(akalin): When we have timestamps, we may want to do
   // something more intelligent than preferring the sync data over our
   // local data.
-  if (node.InitByClientTagLookup(syncable::THEMES, kCurrentThemeClientTag)) {
+  if (node.InitByClientTagLookup(syncable::THEMES, kCurrentThemeClientTag) ==
+      sync_api::BaseNode::INIT_OK) {
     // Update the current theme from the sync data.
     // TODO(akalin): If the sync data does not have
     // use_system_theme_by_default and we do, update that flag on the
     // sync data.
     sync_pb::ThemeSpecifics theme_specifics = node.GetThemeSpecifics();
     if (UpdateThemeSpecificsOrSetCurrentThemeIfNecessary(profile,
                                                          &theme_specifics))
       node.SetThemeSpecifics(theme_specifics);
   } else {
     // Set the sync data from the current theme.
@@ skipping 17 matching lines @@
 SyncError ThemeModelAssociator::DisassociateModels() {
   // We don't maintain any association state, so nothing to do.
   return SyncError();
 }
 
 bool ThemeModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
   DCHECK(has_nodes);
   *has_nodes = false;
   sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   sync_api::ReadNode root(&trans);
-  if (!root.InitByTagLookup(kThemesTag)) {
+  if (root.InitByTagLookup(kThemesTag) != sync_api::BaseNode::INIT_OK) {
     LOG(ERROR) << kNoThemesFolderError;
     return false;
   }
   // The sync model has user created nodes iff the themes folder has
   // any children.
   *has_nodes = root.HasChildren();
   return true;
 }
 
 bool ThemeModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   sync_api::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncable::ModelTypeSet encrypted_types =
       sync_api::GetEncryptedTypes(&trans);
   return !encrypted_types.Has(syncable::THEMES) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync