Read pnacl version from common .json file instead of using dirname.

Read pnacl version from common .json file instead of using dirname.

For about:nacl, it didn't seem too clean to check the
directory structure for the PNaCl version number, and it
required tweaking when we switching from normal CRX'es to
multi-CRX.  This scheme of checking the dirname also doesn't
work with local chrome builds or with ChromeOS.  Instead,
grab the version number from the pnacl_public_pnacl_json.

Depends on: https://codereview.chromium.org/22301014/
and on a new package of PNaCl being pushed out.
However, this should still be tolerant of missing keys
(just won't show the version).

BUG=221381
NOTRY=true
(failed tries unrelated)

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=216829

[jvoung (off chromium), 2013-08-09 01:00:18]

Oops looks like James is on paternity.  Can you review +dbeam?  Thanks!

[Dan Beam, 2013-08-09 01:12:28]

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
File chrome/browser/ui/webui/nacl_ui.cc (right):

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:90: void DidCheckPathAndVersion(bool*
is_valid, std::string* version);
^ can this be private?

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:336: return;
nit: \n

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:338: "pnacl-version", version))
nit: curlies

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:339: return;
nit: why are you returning at the end?

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:363: version_string),
nit: looks like this fits in 1 line

[jvoung (off chromium), 2013-08-09 03:31:53]

Thanks for the review!

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
File chrome/browser/ui/webui/nacl_ui.cc (right):

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:90: void DidCheckPathAndVersion(bool*
is_valid, std::string* version);
On 2013/08/09 01:12:29, Dan Beam wrote:
> ^ can this be private?

Yep, some of the other callbacks can be too. Done.

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:336: return;
On 2013/08/09 01:12:29, Dan Beam wrote:
> nit: \n

Done.

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:339: return;
On 2013/08/09 01:12:29, Dan Beam wrote:
> nit: why are you returning at the end?

Oops, I used to have DLOG warnings for these.  Now it just looks silly =)

https://codereview.chromium.org/22415017/diff/2001/chrome/browser/ui/webui/na...
chrome/browser/ui/webui/nacl_ui.cc:363: version_string),
On 2013/08/09 01:12:29, Dan Beam wrote:
> nit: looks like this fits in 1 line

Done.

[Dan Beam, 2013-08-09 22:26:26]

lgtm

https://codereview.chromium.org/22415017/diff/12001/chrome/browser/ui/webui/n...
File chrome/browser/ui/webui/nacl_ui.cc (right):

https://codereview.chromium.org/22415017/diff/12001/chrome/browser/ui/webui/n...
chrome/browser/ui/webui/nacl_ui.cc:335: if (!root.get() ||
!root->IsType(base::Value::TYPE_DICTIONARY))
nit: !root

https://codereview.chromium.org/22415017/diff/12001/chrome/browser/ui/webui/n...
chrome/browser/ui/webui/nacl_ui.cc:340:
static_cast<base::DictionaryValue*>(root.get())
nit: -> at end

static_cast<base::DictionaryValue*>(root.get())->
    GetStringASCII("pnacl-version", version);

[jvoung (off chromium), 2013-08-09 22:47:40]

https://codereview.chromium.org/22415017/diff/12001/chrome/browser/ui/webui/n...
File chrome/browser/ui/webui/nacl_ui.cc (right):

https://codereview.chromium.org/22415017/diff/12001/chrome/browser/ui/webui/n...
chrome/browser/ui/webui/nacl_ui.cc:335: if (!root.get() ||
!root->IsType(base::Value::TYPE_DICTIONARY))
On 2013/08/09 22:26:26, Dan Beam wrote:
> nit: !root

Done.

https://codereview.chromium.org/22415017/diff/12001/chrome/browser/ui/webui/n...
chrome/browser/ui/webui/nacl_ui.cc:340:
static_cast<base::DictionaryValue*>(root.get())
On 2013/08/09 22:26:26, Dan Beam wrote:
> nit: -> at end
> 
> static_cast<base::DictionaryValue*>(root.get())->
>     GetStringASCII("pnacl-version", version);

Done.

[commit-bot: I haz the power, 2013-08-09 22:53:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jvoung@chromium.org/22415017/35001

[commit-bot: I haz the power, 2013-08-10 03:48:30]

Retried try job too often on win_rel for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[commit-bot: I haz the power, 2013-08-10 04:01:04]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/jvoung@chromium.org/22415017/35001

[commit-bot: I haz the power, 2013-08-10 08:32:22]

Change committed as 216829