diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:15:41 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:15:41 +0000 |
| commit | cd57857578b7b905ee27580d8ca279f6f7642e82 (patch) | |
| tree | 82230a21554f358452b508ee64ef1ea3efcb518b /remoting/host/elevated_controller_win.cc | |
| parent | cc7cde43832b547cdab856fe1bedc9514ca38e13 (diff) | |
| download | chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.zip chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.gz chromium_src-cd57857578b7b905ee27580d8ca279f6f7642e82.tar.bz2 | |
Modify the base::JSONReader interface to take a set of options rather than a boolean flag.
This is just prep work for a large CL that rewrites the JSON parser. Splitting
out this interface change will make it easier to review the other CL.
BUG=121469
TEST=No functional change.
Review URL: https://chromiumcodereview.appspot.com/9960077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/elevated_controller_win.cc')
| -rw-r--r-- | remoting/host/elevated_controller_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/remoting/host/elevated_controller_win.cc b/remoting/host/elevated_controller_win.cc index 1c13ffa..1a8bec6 100644 --- a/remoting/host/elevated_controller_win.cc +++ b/remoting/host/elevated_controller_win.cc @@ -74,7 +74,8 @@ HRESULT ReadConfig(const FilePath& filename, // Parse the JSON configuration, expecting it to contain a dictionary. std::string file_content(buffer.get(), size); - scoped_ptr<base::Value> value(base::JSONReader::Read(file_content, true)); + scoped_ptr<base::Value> value( + base::JSONReader::Read(file_content, base::JSON_ALLOW_TRAILING_COMMAS)); base::DictionaryValue* dictionary; if (value.get() == NULL || !value->GetAsDictionary(&dictionary)) { |