diff options
Diffstat (limited to 'chrome')
8 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index 0070387..8b4c519 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -250,7 +250,7 @@ void PluginFinder::ReinitializePlugins( identifier_plugin_.clear(); for (DictionaryValue::Iterator plugin_it(*plugin_list); - plugin_it.HasNext(); plugin_it.Advance()) { + !plugin_it.IsAtEnd(); plugin_it.Advance()) { const DictionaryValue* plugin = NULL; const std::string& identifier = plugin_it.key(); if (plugin_list->GetDictionaryWithoutPathExpansion(identifier, &plugin)) { diff --git a/chrome/browser/plugins/plugin_finder_unittest.cc b/chrome/browser/plugins/plugin_finder_unittest.cc index ed1ac31..86b9ead 100644 --- a/chrome/browser/plugins/plugin_finder_unittest.cc +++ b/chrome/browser/plugins/plugin_finder_unittest.cc @@ -22,7 +22,7 @@ TEST(PluginFinderTest, JsonSyntax) { EXPECT_EQ(base::Value::TYPE_INTEGER, version->GetType()); for (DictionaryValue::Iterator plugin_it(*plugin_list); - plugin_it.HasNext(); plugin_it.Advance()) { + !plugin_it.IsAtEnd(); plugin_it.Advance()) { const DictionaryValue* plugin = NULL; ASSERT_TRUE(plugin_it.value().GetAsDictionary(&plugin)); std::string dummy_str; diff --git a/chrome/browser/policy/policy_loader_mac_unittest.cc b/chrome/browser/policy/policy_loader_mac_unittest.cc index 0bc3218..a5b1f6a06 100644 --- a/chrome/browser/policy/policy_loader_mac_unittest.cc +++ b/chrome/browser/policy/policy_loader_mac_unittest.cc @@ -72,7 +72,7 @@ CFPropertyListRef CreatePropertyFromValue(const base::Value* value) { &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); for (base::DictionaryValue::Iterator iterator(*dict_value); - iterator.HasNext(); iterator.Advance()) { + !iterator.IsAtEnd(); iterator.Advance()) { // CFDictionaryAddValue() retains both |key| and |value|, so make sure // the references are balanced. ScopedCFTypeRef<CFStringRef> key( @@ -311,7 +311,7 @@ TEST_F(PolicyLoaderMacTest, TestConversions) { // base::Value::TYPE_LIST base::ListValue list; root.Set("emptyl", list.DeepCopy()); - for (base::DictionaryValue::Iterator it(root); it.HasNext(); it.Advance()) + for (base::DictionaryValue::Iterator it(root); !it.IsAtEnd(); it.Advance()) list.Append(it.value().DeepCopy()); EXPECT_EQ(root.size(), list.GetSize()); list.Append(root.DeepCopy()); diff --git a/chrome/browser/policy/policy_loader_win_unittest.cc b/chrome/browser/policy/policy_loader_win_unittest.cc index 00b303b..5193063 100644 --- a/chrome/browser/policy/policy_loader_win_unittest.cc +++ b/chrome/browser/policy/policy_loader_win_unittest.cc @@ -81,7 +81,7 @@ bool InstallValue(const base::Value& value, if (!value.GetAsDictionary(&sub_dict)) return false; for (base::DictionaryValue::Iterator it(*sub_dict); - it.HasNext(); it.Advance()) { + !it.IsAtEnd(); it.Advance()) { if (!InstallValue(it.value(), hive, path + kPathSep + name, UTF8ToUTF16(it.key()))) { return false; @@ -149,7 +149,7 @@ base::DictionaryValue* BuildSchema(const base::Value& value) { if (value.GetAsDictionary(&dict)) { base::DictionaryValue* properties = new base::DictionaryValue(); for (base::DictionaryValue::Iterator it(*dict); - it.HasNext(); it.Advance()) { + !it.IsAtEnd(); it.Advance()) { properties->Set(it.key(), BuildSchema(it.value())); } schema->SetString(schema::kType, "object"); @@ -379,14 +379,14 @@ void TestHarness::Install3rdPartyPolicy(const base::DictionaryValue* policies) { const string16 kPathPrefix = string16(kRegistryMandatorySubKey) + kPathSep + kThirdParty + kPathSep; for (base::DictionaryValue::Iterator domain(*policies); - domain.HasNext(); domain.Advance()) { + !domain.IsAtEnd(); domain.Advance()) { const base::DictionaryValue* components = NULL; if (!domain.value().GetAsDictionary(&components)) { ADD_FAILURE(); continue; } for (base::DictionaryValue::Iterator component(*components); - component.HasNext(); component.Advance()) { + !component.IsAtEnd(); component.Advance()) { const string16 path = string16(kRegistryMandatorySubKey) + kPathSep + kThirdParty + kPathSep + UTF8ToUTF16(domain.key()) + kPathSep + diff --git a/chrome/browser/policy/preg_parser_win.cc b/chrome/browser/policy/preg_parser_win.cc index 60228a7..9963506 100644 --- a/chrome/browser/policy/preg_parser_win.cc +++ b/chrome/browser/policy/preg_parser_win.cc @@ -193,7 +193,7 @@ void HandleRecord(const string16& key_name, } else if (StartsWithASCII(action_trigger, kActionTriggerDelVals, true)) { // Delete all values, but keep keys (i.e. retain dictionary entries). base::DictionaryValue new_dict; - for (base::DictionaryValue::Iterator it(*dict); it.HasNext(); + for (base::DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) { base::DictionaryValue* subdict = NULL; if (dict->GetDictionaryWithoutPathExpansion(it.key(), &subdict)) { diff --git a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc index 19e6404..1bd75cd 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc @@ -32,7 +32,7 @@ bool ListMatches(base::ListValue* left_list, const std::string& right_json) { CHECK(left_list->GetDictionary(i, &left_dict)); CHECK(right_list->GetDictionary(i, &right_dict)); for (base::DictionaryValue::Iterator iter(*right_dict); - iter.HasNext(); iter.Advance()) { + !iter.IsAtEnd(); iter.Advance()) { base::Value* left_value = NULL; if (left_dict->HasKey(iter.key()) && left_dict->Get(iter.key(), &left_value) && diff --git a/chrome/browser/value_store/leveldb_value_store.cc b/chrome/browser/value_store/leveldb_value_store.cc index bad05dd..60b7c2e 100644 --- a/chrome/browser/value_store/leveldb_value_store.cc +++ b/chrome/browser/value_store/leveldb_value_store.cc @@ -234,7 +234,7 @@ ValueStore::WriteResult LeveldbValueStore::Set( leveldb::WriteBatch batch; scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList()); - for (DictionaryValue::Iterator it(settings); it.HasNext(); it.Advance()) { + for (DictionaryValue::Iterator it(settings); !it.IsAtEnd(); it.Advance()) { error = AddToBatch(options, it.key(), it.value(), &batch, changes.get()); if (!error.empty()) { return WriteFailureForKey("find changes to set multiple items", diff --git a/chrome/browser/value_store/testing_value_store.cc b/chrome/browser/value_store/testing_value_store.cc index 9e0c42f..e226e80 100644 --- a/chrome/browser/value_store/testing_value_store.cc +++ b/chrome/browser/value_store/testing_value_store.cc @@ -99,7 +99,7 @@ ValueStore::WriteResult TestingValueStore::Set( } scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList()); - for (DictionaryValue::Iterator it(settings); it.HasNext(); it.Advance()) { + for (DictionaryValue::Iterator it(settings); !it.IsAtEnd(); it.Advance()) { Value* old_value = NULL; if (!storage_.GetWithoutPathExpansion(it.key(), &old_value) || !old_value->Equals(&it.value())) { @@ -139,7 +139,7 @@ ValueStore::WriteResult TestingValueStore::Remove( ValueStore::WriteResult TestingValueStore::Clear() { std::vector<std::string> keys; - for (DictionaryValue::Iterator it(storage_); it.HasNext(); it.Advance()) { + for (DictionaryValue::Iterator it(storage_); !it.IsAtEnd(); it.Advance()) { keys.push_back(it.key()); } return Remove(keys); |