BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.

Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

2 files changed, 1 insertions, 3 deletions

diff --git a/chromium/ppapi/native_client/tools/browser_tester/browser_tester.py b/chromium/ppapi/native_client/tools/browser_tester/browser_tester.py
index 844956d7b3e..6c662910ea4 100755
--- a/chromium/ppapi/native_client/tools/browser_tester/browser_tester.py
+++ b/chromium/ppapi/native_client/tools/browser_tester/browser_tester.py
@@ -211,7 +211,7 @@ def RunTestsOnce(url, options):
   options.files.append(os.path.join(script_dir, 'browserdata', 'nacltest.js'))
 
   # Setup the environment with the setuid sandbox path.
-  test_env.enable_sandbox_if_required(os.environ)
+  os.environ.update(test_env.get_sandbox_env(sys.argv, os.environ))
 
   # Create server
   host = GetHostName()
diff --git a/chromium/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py b/chromium/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
index 36b8c2ab2bc..1abbb4479d8 100755
--- a/chromium/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
+++ b/chromium/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
@@ -78,9 +78,7 @@ def MakeEnv(options):
   # Enable PPAPI Dev interfaces for testing.
   env['NACL_ENABLE_PPAPI_DEV'] = str(options.enable_ppapi_dev)
   if options.debug:
-    env['PPAPI_BROWSER_DEBUG'] = '1'
     env['NACL_PLUGIN_DEBUG'] = '1'
-    env['NACL_PPAPI_PROXY_DEBUG'] = '1'
     # env['NACL_SRPC_DEBUG'] = '1'
   return env