diff options
| author | olli.raula <olli.raula@intel.com> | 2015-09-02 01:04:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-02 08:05:26 +0000 |
| commit | 02c962eb8422f7eb49d5c115265827f53635d1ba (patch) | |
| tree | c0a24b2776ab4a4c2995c1465f3fc21d6f1a47d7 | |
| parent | 5e34af68885133aed1561f4a01417e4c38349dc7 (diff) | |
| download | chromium_src-02c962eb8422f7eb49d5c115265827f53635d1ba.zip chromium_src-02c962eb8422f7eb49d5c115265827f53635d1ba.tar.gz chromium_src-02c962eb8422f7eb49d5c115265827f53635d1ba.tar.bz2 | |
Remove use of JSONReader::DeprecatedRead from remoting/
Remove use of deprecated function DeprecatedRead from
remoting/
BUG=523194
Review URL: https://codereview.chromium.org/1324853002
Cr-Commit-Position: refs/heads/master@{#346864}
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 4 | ||||
| -rw-r--r-- | remoting/host/setup/daemon_controller_delegate_win.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index baaba20..9111f61 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -212,8 +212,8 @@ void ChromotingInstance::HandleMessage(const pp::Var& message) { return; } - scoped_ptr<base::Value> json(base::JSONReader::DeprecatedRead( - message.AsString(), base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> json = base::JSONReader::Read( + message.AsString(), base::JSON_ALLOW_TRAILING_COMMAS); base::DictionaryValue* message_dict = nullptr; std::string method; base::DictionaryValue* data = nullptr; diff --git a/remoting/host/setup/daemon_controller_delegate_win.cc b/remoting/host/setup/daemon_controller_delegate_win.cc index 9d14e2b..053d867 100644 --- a/remoting/host/setup/daemon_controller_delegate_win.cc +++ b/remoting/host/setup/daemon_controller_delegate_win.cc @@ -72,8 +72,8 @@ bool ReadConfig(const base::FilePath& filename, } // Parse the JSON configuration, expecting it to contain a dictionary. - scoped_ptr<base::Value> value(base::JSONReader::DeprecatedRead( - file_content, base::JSON_ALLOW_TRAILING_COMMAS)); + scoped_ptr<base::Value> value = + base::JSONReader::Read(file_content, base::JSON_ALLOW_TRAILING_COMMAS); base::DictionaryValue* dictionary; if (!value || !value->GetAsDictionary(&dictionary)) { |