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

Unified Diff: chrome/test/remoting/remote_desktop_browsertest.cc

Issue 1310173010: Remove use of JSONReader::DeprecatedRead from chrome/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix error 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: chrome/test/remoting/remote_desktop_browsertest.cc
diff --git a/chrome/test/remoting/remote_desktop_browsertest.cc b/chrome/test/remoting/remote_desktop_browsertest.cc
index e869653011c52705ab8633541b7e9d198d495f04..c255befd8cd0ec546cbbc96600e492df82ca234e 100644
--- a/chrome/test/remoting/remote_desktop_browsertest.cc
+++ b/chrome/test/remoting/remote_desktop_browsertest.cc
@@ -7,6 +7,7 @@
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
+#include "base/macros.h"
#include "base/path_service.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/unpacked_installer.h"
@@ -858,11 +859,12 @@ void RemoteDesktopBrowserTest::SetUserNameAndPassword(
ASSERT_TRUE(base::ReadFileToString(absolute_path, &accounts_info));
// Get the root dictionary from the input json file contents.
- scoped_ptr<base::Value> root(base::JSONReader::DeprecatedRead(
- accounts_info, base::JSON_ALLOW_TRAILING_COMMAS));
+ scoped_ptr<base::Value> root =
+ base::JSONReader::Read(accounts_info, base::JSON_ALLOW_TRAILING_COMMAS);
const base::DictionaryValue* root_dict = NULL;
ASSERT_TRUE(root.get() && root->GetAsDictionary(&root_dict));
+ ignore_result(root.release());
sky 2015/09/09 16:03:03 Where does root get destroyed?
// Now get the dictionary for the specified account type.
const base::DictionaryValue* account_dict = NULL;

Powered by Google App Engine
This is Rietveld 408576698