Revert 240802 "Fix create_nmf.py on non-English locale."

Suspected to break ppapi/nacl glibc tests

> Fix create_nmf.py on non-English locale.
> 
> It would fail parsing localized string otherwise. For example 'file format' is
> 'format de fichier' with LANG=fr_CA.UTF-8.
> 
> Fix file_arch could be used before being assigned.
> 
> R=sbc@chromium.org
> BUG=
> 
> Review URL: https://codereview.chromium.org/108213002

TBR=maruel@chromium.org

Review URL: https://codereview.chromium.org/116193002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240860 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 240860
Whitespace change to trigger linux bots

BUG=none
TBR=kjellander@chromium.org

Review URL: https://codereview.chromium.org/116223002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240862 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 240862
Fix JavaScript wait expression in mobile_memory.json.

The previous approach was relying on the screen height/orientation and was
failing on Nexus 10. This new approach waits for a certain amount of images to
be displayed which works better across devices/screens.

TBR=tonyg@chromium.org

BUG=328686

Review URL: https://codereview.chromium.org/99243004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240864 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 240864
ONC: Reject ServerCARef in IPsec if PSK is used.

Looking at IpsecManager::Initialize in platform/vpn-manager/ipsec_manager.cc, then a CA certificate for server verification is rejected if a PSK is set.

However, in ONC, the ServerCARef was silently ignored if PSK was used. This might unintentionally reduce security.

Note: ServerCARef from ONC maps to server_ca_file in  IpsecManager::Initialize.
PSK from ONC maps to psk_file in IpsecManager::Initialize.

BUG=276291
R=bartfab@chromium.org

Review URL: https://codereview.chromium.org/62173002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240865 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 240865
Remove untracked dependency "lib32" from browser_tests.isolate

It isn't build anymore. No idea why. However, trybots started to
fail because of this.

BUG=none
TBR=maruel@chromium.org

Review URL: https://codereview.chromium.org/98233010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240867 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 240867
Update keygen to use correct NSS slot on ChromeOS multiprofile.

BUG=302126

Review URL: https://codereview.chromium.org/61643007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240868 0039d316-1c4b-4281-b951-d872f2087c98
Roll Skia DEPS to r12678

R=reed@google.com, rmistry@google.com

Review URL: https://codereview.chromium.org/103343003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240869 0039d316-1c4b-4281-b951-d872f2087c98
Include plus.google.com and plus.sandbox.google.com in the NaCl whitelist.
We need these hosts whitelisted to make Hangouts work properly.
See the comments in the original CL that extended the whitelist: https://chromiumcodereview.appspot.com/23466009#msg9
Also extend the manifest list to filesystem:https://... so we can load a cached plugin.

NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/99203009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240870 0039d316-1c4b-4281-b951-d872f2087c98
Update .DEPS.git

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240871 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 240871
Add --disable-avfoundation to the command line for all webrtc chrome browser tests.
This is a follow up to https://codereview.chromium.org/112773003 by mcasas to make sure no webrtc bot uses manycam on Mac.

BUG=327618
NOTRY=true

Review URL: https://codereview.chromium.org/100103009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240872 0039d316-1c4b-4281-b951-d872f2087c98
Fix DCHECK() when updating instruments with no phone number.

Also refactors SaveToWallet() to take a |reference_{instrument,address}| instead of setting an object_id in the controller as well as refactors the way that WalletClient queues pending requests to be less error prone and maybe copy less memory? (definitely simpler)

R=estade@chromium.org
BUG=326671
TEST=unit_tests
NOTRY=true

Review URL: https://codereview.chromium.org/100743006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240873 0039d316-1c4b-4281-b951-d872f2087c98
ONC: Allow multiple CA certificates.

So far only a single CA certificate was supported for EAP/IPsec/OpenVPN. Instead, we now support multiple CA certs. These are provided as a list of GUID references to CA certificates in the toplevel "Certificates" section.

BUG=276291
R=armansito@chromium.org, davidroche@chromium.org

Review URL: https://codereview.chromium.org/68343010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240874 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 240873
SVN changes up to revision 240874