Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3156)

Unified Diff: chromeos/network/auto_connect_handler_unittest.cc

Issue 1328233002: Ramove use of JSONReader::DeprecatedRead from chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ignore_result's Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/network/auto_connect_handler_unittest.cc
diff --git a/chromeos/network/auto_connect_handler_unittest.cc b/chromeos/network/auto_connect_handler_unittest.cc
index a52f60e53dfcdc8dde935e7ee784410e893aed51..11431084a03cd00336083fa5de859701e13fea8f 100644
--- a/chromeos/network/auto_connect_handler_unittest.cc
+++ b/chromeos/network/auto_connect_handler_unittest.cc
@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
@@ -214,13 +215,14 @@ class AutoConnectHandlerTest : public testing::Test {
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);
+ 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) << error;
base::ListValue* network_configs_list = nullptr;
ASSERT_TRUE(network_configs_value->GetAsList(&network_configs_list));
+ ignore_result(network_configs_value.release());
network_configs.reset(network_configs_list);
}
« no previous file with comments | « chromeos/geolocation/simple_geolocation_request.cc ('k') | chromeos/network/client_cert_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698