Remove use of JSONReader::DeprecatedRead from chrome/test

chrome/test/remoting/remote_desktop_browsertest.cc

 // Copyright 2013 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 "chrome/test/remoting/remote_desktop_browsertest.h"
 
 #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"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/remoting/key_code_conv.h"
 #include "chrome/test/remoting/page_load_notification_observer.h"
 #include "chrome/test/remoting/waiter.h"
@@ skipping 823 matching lines @@
   DismissHostVersionWarningIfVisible();
   return HtmlElementVisible("pin-form");
 }
 
 void RemoteDesktopBrowserTest::DismissHostVersionWarningIfVisible() {
   if (HtmlElementVisible("host-needs-update-connect-button"))
     ClickOnControl("host-needs-update-connect-button");
 }
 
 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));
 
   // Now get the dictionary for the specified account type.
   const base::DictionaryValue* account_dict = NULL;
   ASSERT_TRUE(root_dict->GetDictionary(account_type, &account_dict));
   ASSERT_TRUE(account_dict->GetString(kUserName, &username_));
   ASSERT_TRUE(account_dict->GetString(kUserPassword, &password_));
 }
@@ skipping 48 matching lines @@
 
   ConditionalTimeoutWaiter homeWaiter(
           base::TimeDelta::FromSeconds(5),
           base::TimeDelta::FromMilliseconds(500),
           base::Bind(&RemoteDesktopBrowserTest::IsAppModeEqualTo,
                      this, "remoting.AppMode.HOME"));
   EXPECT_TRUE(homeWaiter.Wait());
 }
 
 }  // namespace remoting