Chromium Code Reviews| 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..baee6dac91e69ecda0252e8590db82ec84f30d1c 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,11 @@ 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)); |
| + ASSERT_FALSE(root.get() && root->GetAsDictionary(&root_dict)); |
|
sky
2015/10/02 15:47:35
Why is this changing to ASSERT_FALSE?
|
| // Now get the dictionary for the specified account type. |
| const base::DictionaryValue* account_dict = NULL; |