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

chrome/browser/sync/profile_sync_service_preference_unittest.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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 45 matching lines @@
   return *change_processor;
 }
 
 // TODO(zea): Refactor to remove the ProfileSyncService usage.
 class ProfileSyncServicePreferenceTest
     : public AbstractProfileSyncServiceTest {
  public:
   int64 SetSyncedValue(const std::string& name, const Value& value) {
     sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
     sync_api::ReadNode root(&trans);
-    if (!root.InitByTagLookup(
-        syncable::ModelTypeToRootTag(syncable::PREFERENCES))) {
+    if (root.InitByTagLookup(
+            syncable::ModelTypeToRootTag(syncable::PREFERENCES)) !=

[Nicolas Zea, 2012/04/19 23:55:43]

nit: move to prev line? (if it fits)

[tim (not reviewing), 2012/04/20 18:27:04]

Done.

+                sync_api::BaseNode::INIT_OK) {
       return sync_api::kInvalidId;
     }
 
     sync_api::WriteNode tag_node(&trans);
     sync_api::WriteNode node(&trans);
 
-    if (tag_node.InitByClientTagLookup(syncable::PREFERENCES, name))
+    if (tag_node.InitByClientTagLookup(syncable::PREFERENCES, name) ==
+            sync_api::BaseNode::INIT_OK) {
       return WriteSyncedValue(name, value, &tag_node);
+    }
     if (node.InitUniqueByCreation(syncable::PREFERENCES, root, name))
       return WriteSyncedValue(name, value, &node);
 
     return sync_api::kInvalidId;
   }
 
  protected:
   ProfileSyncServicePreferenceTest()
       : example_url0_("http://example.com/0"),
         example_url1_("http://example.com/1"),
@@ skipping 65 matching lines @@
     const PrefService::Preference* preference =
         prefs_->FindPreference(name.c_str());
     return *preference->GetValue();
   }
 
   // Caller gets ownership of the returned value.
   const Value* GetSyncedValue(const std::string& name) {
     sync_api::ReadTransaction trans(FROM_HERE, service_->GetUserShare());
     sync_api::ReadNode node(&trans);
 
-    if (!node.InitByClientTagLookup(syncable::PREFERENCES, name))
+    if (node.InitByClientTagLookup(syncable::PREFERENCES, name) !=
+            sync_api::BaseNode::INIT_OK) {
       return NULL;
+    }
 
     const sync_pb::PreferenceSpecifics& specifics(
         node.GetEntitySpecifics().preference());
 
     return base::JSONReader::Read(specifics.value());
   }
 
   int64 WriteSyncedValue(const std::string& name,
                          const Value& value,
                          sync_api::WriteNode* node) {
@@ skipping 395 matching lines @@
   EXPECT_FALSE(pref->IsDefaultValue());
   // There should be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
   // Switch kHomePage back to unmanaged.
   profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);
   // The original value should be picked up.
   EXPECT_TRUE(pref->IsDefaultValue());
   // There should still be no synced value.
   EXPECT_TRUE(GetSyncedValue(prefs::kHomePage) == NULL);
 }