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

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 Created 5 years, 2 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
« no previous file with comments | « chrome/test/chromedriver/performance_logger_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..c8b006acd011651de27ca2b598ee365815d29d58 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"
@@ -850,16 +851,16 @@ void RemoteDesktopBrowserTest::DismissHostVersionWarningIfVisible() {
}
void RemoteDesktopBrowserTest::SetUserNameAndPassword(
- const base::FilePath &accounts_file_path, const std::string& account_type) {
-
+ const base::FilePath& accounts_file_path,
+ const std::string& account_type) {
// Read contents of accounts file, using its absolute path.
base::FilePath absolute_path = base::MakeAbsoluteFilePath(accounts_file_path);
std::string accounts_info;
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));
« no previous file with comments | « chrome/test/chromedriver/performance_logger_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698