Replace HasNext() by !IsAtEnd() in network related folders.

BUG=162611


Review URL: https://chromiumcodereview.appspot.com/13532002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192294 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 12 insertions, 12 deletions

diff --git a/chromeos/dbus/shill_client_helper.cc b/chromeos/dbus/shill_client_helper.cc
index a3c35d4..ed9c994 100644
--- a/chromeos/dbus/shill_client_helper.cc
+++ b/chromeos/dbus/shill_client_helper.cc
@@ -367,7 +367,7 @@ void ShillClientHelper::AppendValueDataAsVariant(dbus::MessageWriter* writer,
       dbus::MessageWriter array_writer(NULL);
       variant_writer.OpenArray("{ss}", &array_writer);
       for (base::DictionaryValue::Iterator it(*dictionary);
-           it.HasNext();
+           !it.IsAtEnd();
            it.Advance()) {
         dbus::MessageWriter entry_writer(NULL);
         array_writer.OpenDictEntry(&entry_writer);
diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc
index e99a940..1be4bf2 100644
--- a/chromeos/dbus/shill_manager_client.cc
+++ b/chromeos/dbus/shill_manager_client.cc
@@ -37,7 +37,7 @@ void AppendServicePropertiesDictionary(
   dbus::MessageWriter array_writer(NULL);
   writer->OpenArray("{sv}", &array_writer);
   for (base::DictionaryValue::Iterator it(dictionary);
-       it.HasNext();
+       !it.IsAtEnd();
        it.Advance()) {
     dbus::MessageWriter entry_writer(NULL);
     array_writer.OpenDictEntry(&entry_writer);
diff --git a/chromeos/network/geolocation_handler.cc b/chromeos/network/geolocation_handler.cc
index c08ea14..65aca0d 100644
--- a/chromeos/network/geolocation_handler.cc
+++ b/chromeos/network/geolocation_handler.cc
@@ -132,7 +132,7 @@ void GeolocationHandler::GeolocationCallback(
 
   // Dictionary<device_type, entry_list>
   for (base::DictionaryValue::Iterator iter(properties);
-       iter.HasNext(); iter.Advance()) {
+       !iter.IsAtEnd(); iter.Advance()) {
     const base::ListValue* entry_list = NULL;
     if (!iter.value().GetAsList(&entry_list)) {
       LOG(WARNING) << "Geolocation dictionary value not a List: " << iter.key();
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index e623b0e..3fa860e 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -394,7 +394,7 @@ void NetworkStateHandler::UpdateManagedStateProperties(
   if (type == ManagedState::MANAGED_TYPE_NETWORK)
     prev_connection_state = managed->AsNetworkState()->connection_state();
   for (base::DictionaryValue::Iterator iter(properties);
-       iter.HasNext(); iter.Advance()) {
+       !iter.IsAtEnd(); iter.Advance()) {
     if (type == ManagedState::MANAGED_TYPE_NETWORK) {
       if (managed->PropertyChanged(iter.key(), iter.value()))
         network_property_updated = true;
@@ -435,8 +435,7 @@ void NetworkStateHandler::UpdateNetworkServiceProperty(
 
   if (network->connection_state() != prev_connection_state) {
     OnNetworkConnectionStateChanged(network);
-  }
-  else if (network->path() == default_network_path_ &&
+  } else if (network->path() == default_network_path_ &&
            key != flimflam::kSignalStrengthProperty) {
     // WiFi signal strength updates are too noisy, so don't
     // trigger default network updates for those changes.
diff --git a/chromeos/network/onc/onc_mapper.cc b/chromeos/network/onc/onc_mapper.cc
index 604ae7a..83c0e25 100644
--- a/chromeos/network/onc/onc_mapper.cc
+++ b/chromeos/network/onc/onc_mapper.cc
@@ -67,7 +67,7 @@ void Mapper::MapFields(const OncValueSignature& object_signature,
                        bool* found_unknown_field,
                        bool* nested_error,
                        base::DictionaryValue* result) {
-  for (base::DictionaryValue::Iterator it(onc_object); it.HasNext();
+  for (base::DictionaryValue::Iterator it(onc_object); !it.IsAtEnd();
        it.Advance()) {
     bool current_field_unknown = false;
     scoped_ptr<base::Value> result_value = MapField(it.key(),
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index 7fecfb4..8403f91 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -41,7 +41,8 @@ DictionaryPtr GetEditableFlags(const base::DictionaryValue& policy) {
   MarkRecommendedFieldnames(policy, result_editable.get());
 
   // Recurse into nested dictionaries.
-  for (base::DictionaryValue::Iterator it(policy); it.HasNext(); it.Advance()) {
+  for (base::DictionaryValue::Iterator it(policy); !it.IsAtEnd();
+       it.Advance()) {
     const base::DictionaryValue* child_policy = NULL;
     if (it.key() == kRecommended ||
         !it.value().GetAsDictionary(&child_policy)) {
diff --git a/chromeos/network/onc/onc_translator_onc_to_shill.cc b/chromeos/network/onc/onc_translator_onc_to_shill.cc
index 0b9e924..70831c4 100644
--- a/chromeos/network/onc/onc_translator_onc_to_shill.cc
+++ b/chromeos/network/onc/onc_translator_onc_to_shill.cc
@@ -109,7 +109,7 @@ void LocalTranslator::TranslateOpenVPN() {
         flimflam::kOpenVPNRemoteCertKUProperty, certKU);
   }
 
-  for (base::DictionaryValue::Iterator it(*onc_object_); it.HasNext();
+  for (base::DictionaryValue::Iterator it(*onc_object_); !it.IsAtEnd();
        it.Advance()) {
     scoped_ptr<base::Value> translated;
     if (it.key() == vpn::kSaveCredentials || it.key() == vpn::kRemoteCertKU) {
@@ -182,7 +182,7 @@ void LocalTranslator::TranslateNetworkConfiguration() {
 }
 
 void LocalTranslator::CopyFieldsAccordingToSignature() {
-  for (base::DictionaryValue::Iterator it(*onc_object_); it.HasNext();
+  for (base::DictionaryValue::Iterator it(*onc_object_); !it.IsAtEnd();
        it.Advance()) {
     AddValueAccordingToSignature(it.key(),
                                  make_scoped_ptr(it.value().DeepCopy()));
@@ -234,7 +234,7 @@ void TranslateONCHierarchy(const OncValueSignature& signature,
   translator.TranslateFields();
 
   // Recurse into nested objects.
-  for (base::DictionaryValue::Iterator it(onc_object); it.HasNext();
+  for (base::DictionaryValue::Iterator it(onc_object); !it.IsAtEnd();
        it.Advance()) {
     const base::DictionaryValue* inner_object = NULL;
     if (!it.value().GetAsDictionary(&inner_object))
diff --git a/chromeos/network/shill_property_handler.cc b/chromeos/network/shill_property_handler.cc
index 6749518..f15cb85 100644
--- a/chromeos/network/shill_property_handler.cc
+++ b/chromeos/network/shill_property_handler.cc
@@ -221,7 +221,7 @@ void ShillPropertyHandler::ManagerPropertiesCallback(
   bool notify = false;
   bool update_service_list = false;
   for (base::DictionaryValue::Iterator iter(properties);
-       iter.HasNext(); iter.Advance()) {
+       !iter.IsAtEnd(); iter.Advance()) {
     // Defer updating Services until all other properties have been updated.
     if (iter.key() == flimflam::kServicesProperty)
       update_service_list = true;