RELAND: ONC: Fix handling of invalid proxy scheme.

chromeos/network/onc/onc_utils_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 "chromeos/network/onc/onc_utils.h"
 
 #include <string>
 
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
@@ skipping 149 matching lines @@
                                                    actual_resolved_onc.get());
     EXPECT_EQ(expected_success, success);
     EXPECT_TRUE(test_utils::Equals(expected_resolved_onc,
                                    actual_resolved_onc.get()));
   }
 }
 
 TEST(ONCUtils, ProxySettingsToProxyConfig) {
   std::unique_ptr<base::Value> test_data(ReadTestJson("proxy_config.json"));
 
-  base::ListValue* list_of_tests;
-  test_data->GetAsList(&list_of_tests);
-  ASSERT_TRUE(list_of_tests);
+  base::ListValue* tests1;
+  test_data->GetAsList(&tests1);
+  ASSERT_TRUE(tests1);
+
+  std::unique_ptr<base::ListValue> list_of_tests = tests1->CreateDeepCopy();
+
+  // Additional ONC -> ProxyConfig test cases to test fixup.
+  test_data = ReadTestJson("proxy_config_from_onc.json");
+  base::ListValue* tests2;
+  test_data->GetAsList(&tests2);
+  ASSERT_TRUE(tests2);
+  for (auto iter1 = tests2->begin(); iter1 != tests2->end(); ++iter1)
+    list_of_tests->Append((*iter1)->CreateDeepCopy());
 
   int index = 0;
-  for (base::ListValue::iterator it = list_of_tests->begin();
-       it != list_of_tests->end(); ++it, ++index) {
+  for (auto iter2 = list_of_tests->begin(); iter2 != list_of_tests->end();
+       ++iter2, ++index) {
     SCOPED_TRACE("Test case #" + base::IntToString(index));
 
-    base::DictionaryValue* test_case;
-    (*it)->GetAsDictionary(&test_case);
+    base::DictionaryValue* test_case = nullptr;
+    (*iter2)->GetAsDictionary(&test_case);
+    ASSERT_TRUE(test_case);
 
     base::DictionaryValue* onc_proxy_settings;
     test_case->GetDictionary("ONC_ProxySettings", &onc_proxy_settings);
 
     base::DictionaryValue* expected_proxy_config;
     test_case->GetDictionary("ProxyConfig", &expected_proxy_config);
 
     std::unique_ptr<base::DictionaryValue> actual_proxy_config =
         ConvertOncProxySettingsToProxyConfig(*onc_proxy_settings);
     EXPECT_TRUE(
@@ skipping 24 matching lines @@
 
     std::unique_ptr<base::DictionaryValue> actual_proxy_settings =
         ConvertProxyConfigToOncProxySettings(*shill_proxy_config);
     EXPECT_TRUE(
         test_utils::Equals(onc_proxy_settings, actual_proxy_settings.get()));
   }
 }
 
 }  // namespace onc
 }  // namespace chromeos