Change PrefStore::ReadResult to a boolean.

chrome/browser/prefs/command_line_pref_store_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 <gtest/gtest.h>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 14 matching lines @@
  public:
   explicit TestCommandLinePrefStore(CommandLine* cl)
       : CommandLinePrefStore(cl) {}
 
   bool ProxySwitchesAreValid() {
     return ValidateProxySwitches();
   }
 
   void VerifyProxyMode(ProxyPrefs::ProxyMode expected_mode) {
     const Value* value = NULL;
-    ASSERT_EQ(PrefStore::READ_OK, GetValue(prefs::kProxy, &value));
+    ASSERT_TRUE(GetValue(prefs::kProxy, &value));
     ASSERT_EQ(Value::TYPE_DICTIONARY, value->GetType());
     ProxyConfigDictionary dict(static_cast<const DictionaryValue*>(value));
     ProxyPrefs::ProxyMode actual_mode;
     ASSERT_TRUE(dict.GetMode(&actual_mode));
     EXPECT_EQ(expected_mode, actual_mode);
   }
 
   void VerifySSLCipherSuites(const char* const* ciphers,
                              size_t cipher_count) {
     const Value* value = NULL;
-    ASSERT_EQ(PrefStore::READ_OK,
-              GetValue(prefs::kCipherSuiteBlacklist, &value));
+    ASSERT_TRUE(GetValue(prefs::kCipherSuiteBlacklist, &value));
     ASSERT_EQ(Value::TYPE_LIST, value->GetType());
     const ListValue* list_value = static_cast<const ListValue*>(value);
     ASSERT_EQ(cipher_count, list_value->GetSize());
 
     std::string cipher_string;
     for (ListValue::const_iterator it = list_value->begin();
          it != list_value->end(); ++it, ++ciphers) {
       ASSERT_TRUE((*it)->GetAsString(&cipher_string));
       EXPECT_EQ(*ciphers, cipher_string);
     }
   }
 
  private:
   virtual ~TestCommandLinePrefStore() {}
 };
 
 // Tests a simple string pref on the command line.
 TEST(CommandLinePrefStoreTest, SimpleStringPref) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitchASCII(switches::kLang, "hi-MOM");
   scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl);
 
   const Value* actual = NULL;
-  EXPECT_EQ(PrefStore::READ_OK,
-            store->GetValue(prefs::kApplicationLocale, &actual));
+  EXPECT_TRUE(store->GetValue(prefs::kApplicationLocale, &actual));
   std::string result;
   EXPECT_TRUE(actual->GetAsString(&result));
   EXPECT_EQ("hi-MOM", result);
 }
 
 // Tests a simple boolean pref on the command line.
 TEST(CommandLinePrefStoreTest, SimpleBooleanPref) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitch(switches::kNoProxyServer);
   scoped_refptr<TestCommandLinePrefStore> store =
       new TestCommandLinePrefStore(&cl);
 
   store->VerifyProxyMode(ProxyPrefs::MODE_DIRECT);
 }
 
 // Tests a command line with no recognized prefs.
 TEST(CommandLinePrefStoreTest, NoPrefs) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitch(unknown_string);
   cl.AppendSwitchASCII(unknown_bool, "a value");
   scoped_refptr<CommandLinePrefStore> store = new CommandLinePrefStore(&cl);
 
   const Value* actual = NULL;
-  EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_bool, &actual));
-  EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_string, &actual));
+  EXPECT_FALSE(store->GetValue(unknown_bool, &actual));
+  EXPECT_FALSE(store->GetValue(unknown_string, &actual));
 }
 
 // Tests a complex command line with multiple known and unknown switches.
 TEST(CommandLinePrefStoreTest, MultipleSwitches) {
   CommandLine cl(CommandLine::NO_PROGRAM);
   cl.AppendSwitch(unknown_string);
   cl.AppendSwitchASCII(switches::kProxyServer, "proxy");
   cl.AppendSwitchASCII(switches::kProxyBypassList, "list");
   cl.AppendSwitchASCII(unknown_bool, "a value");
   scoped_refptr<TestCommandLinePrefStore> store =
       new TestCommandLinePrefStore(&cl);
 
   const Value* actual = NULL;
-  EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_bool, &actual));
-  EXPECT_EQ(PrefStore::READ_NO_VALUE, store->GetValue(unknown_string, &actual));
+  EXPECT_FALSE(store->GetValue(unknown_bool, &actual));
+  EXPECT_FALSE(store->GetValue(unknown_string, &actual));
 
   store->VerifyProxyMode(ProxyPrefs::MODE_FIXED_SERVERS);
 
   const Value* value = NULL;
-  ASSERT_EQ(PrefStore::READ_OK, store->GetValue(prefs::kProxy, &value));
+  ASSERT_TRUE(store->GetValue(prefs::kProxy, &value));
   ASSERT_EQ(Value::TYPE_DICTIONARY, value->GetType());
   ProxyConfigDictionary dict(static_cast<const DictionaryValue*>(value));
 
   std::string string_result = "";
 
   ASSERT_TRUE(dict.GetProxyServer(&string_result));
   EXPECT_EQ("proxy", string_result);
 
   ASSERT_TRUE(dict.GetBypassList(&string_result));
   EXPECT_EQ("list", string_result);
@@ skipping 82 matching lines @@
   cl3.AppendSwitchASCII(switches::kCipherSuiteBlacklist,
                         "0x0004;MOAR;0x0005");
   scoped_refptr<TestCommandLinePrefStore> store3 =
       new TestCommandLinePrefStore(&cl3);
   const char* const expected_ciphers3[] = {
     "0x0004;MOAR;0x0005"
   };
   store3->VerifySSLCipherSuites(expected_ciphers3,
                                 arraysize(expected_ciphers3));
 }