Ramove use of JSONReader::DeprecatedRead from chromeos/

chromeos/network/auto_connect_handler_unittest.cc

 // Copyright 2014 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/auto_connect_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 196 matching lines @@
                                             test_nssdb_.slot()));
     return client_cert;
   }
 
   void SetupPolicy(const std::string& network_configs_json,
                    const base::DictionaryValue& global_config,
                    bool user_policy) {
     scoped_ptr<base::ListValue> network_configs(new base::ListValue);
     if (!network_configs_json.empty()) {
       std::string error;
-      base::Value* network_configs_value =
-          base::JSONReader::DeprecatedReadAndReturnError(
-              network_configs_json, base::JSON_ALLOW_TRAILING_COMMAS, nullptr,
-              &error);
-      ASSERT_TRUE(network_configs_value) << error;
+      scoped_ptr<base::Value> network_configs_value =
+          base::JSONReader::ReadAndReturnError(network_configs_json,
+                                               base::JSON_ALLOW_TRAILING_COMMAS,
+                                               nullptr, &error);
+      ASSERT_TRUE(network_configs_value.get()) << error;

[pneubeck (no reviews), 2015/09/09 11:49:51]

it's common to drop the ".get()" for boolean checks.

       base::ListValue* network_configs_list = nullptr;
-      ASSERT_TRUE(network_configs_value->GetAsList(&network_configs_list));
+      ASSERT_TRUE(
+          network_configs_value.release()->GetAsList(&network_configs_list));

[pneubeck (no reviews), 2015/09/09 11:49:51]

can you do the release after we ensured that network_configs_value is a
ListValue?
Something like:

ASSERT_TRUE(network_configs_value->GetAsList(&network_configs_list));
network_configs_value.release();
network_configs.reset(network_configs_list);

       network_configs.reset(network_configs_list);
     }
 
     if (user_policy) {
       managed_config_handler_->SetPolicy(::onc::ONC_SOURCE_USER_POLICY,
                                          kUserHash, *network_configs,
                                          global_config);
     } else {
       managed_config_handler_->SetPolicy(::onc::ONC_SOURCE_DEVICE_POLICY,
                                          std::string(),  // no username hash
@@ skipping 228 matching lines @@
   // Applying the user policy after login would usually trigger connecting to
   // the 'best' network. But the manual connect prevents this.
   SetupPolicy(std::string(),            // no network configs
               base::DictionaryValue(),  // no global config
               true);                    // load as user policy
   EXPECT_EQ(shill::kStateOnline, GetServiceState("wifi0"));
   EXPECT_EQ(shill::kStateIdle, GetServiceState("wifi1"));
 }
 
 }  // namespace chromeos