[NaCl SDK] update cloud storage URL (commondatastorage -> storage)

TEST=trybots
R=binji@chromium.org

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

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

25 files changed, 43 insertions, 46 deletions

diff --git a/native_client_sdk/src/build_tools/build_paths.py b/native_client_sdk/src/build_tools/build_paths.py
index 9f1801f..f5a0663 100644
--- a/native_client_sdk/src/build_tools/build_paths.py
+++ b/native_client_sdk/src/build_tools/build_paths.py
@@ -19,4 +19,4 @@ NACLPORTS_DIR = os.path.join(OUT_DIR, 'naclports')
 GONACL_APPENGINE_DIR = os.path.join(SDK_SRC_DIR, 'gonacl_appengine')
 GONACL_APPENGINE_SRC_DIR = os.path.join(GONACL_APPENGINE_DIR, 'src')
 
-GSTORE = 'https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/'
+GSTORE = 'https://storage.googleapis.com/nativeclient-mirror/nacl/'
diff --git a/native_client_sdk/src/build_tools/buildbot_common.py b/native_client_sdk/src/build_tools/buildbot_common.py
index f41eea18..316a348 100644
--- a/native_client_sdk/src/build_tools/buildbot_common.py
+++ b/native_client_sdk/src/build_tools/buildbot_common.py
@@ -205,8 +205,7 @@ def Archive(filename, bucket_path, cwd=None, step_link=True):
 
   cmd = [GetGsutil(), 'cp', '-a', 'public-read', filename, full_dst]
   Run(cmd, shell=shell, cwd=cwd)
-  url = 'https://commondatastorage.googleapis.com/'\
-        '%s/%s' % (bucket_path, filename)
+  url = 'https://storage.googleapis.com/%s/%s' % (bucket_path, filename)
   if step_link:
     print '@@@STEP_LINK@download@%s@@@' % url
     sys.stdout.flush()
diff --git a/native_client_sdk/src/build_tools/json/naclsdk_manifest.json b/native_client_sdk/src/build_tools/json/naclsdk_manifest.json
index 720b2b5..88997e6 100644
--- a/native_client_sdk/src/build_tools/json/naclsdk_manifest.json
+++ b/native_client_sdk/src/build_tools/json/naclsdk_manifest.json
@@ -8,7 +8,7 @@
       "version": 1,
       "archives": [
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/1.15/sdk_tools.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/1.15/sdk_tools.tgz",
           "checksum": {
             "sha1": "39b43a08ba4dcf3956c38e9bbe83bdf573c77aad"
           },
@@ -16,7 +16,7 @@
           "size": 17622
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/1.15/sdk_tools.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/1.15/sdk_tools.tgz",
           "checksum": {
             "sha1": "39b43a08ba4dcf3956c38e9bbe83bdf573c77aad"
           },
@@ -24,7 +24,7 @@
           "size": 17622
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/1.15/sdk_tools.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/1.15/sdk_tools.tgz",
           "checksum": {
             "sha1": "39b43a08ba4dcf3956c38e9bbe83bdf573c77aad"
           },
@@ -42,7 +42,7 @@
       "version": 0,
       "archives": [
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/gdb_builds/0.1/gdb-win-builds.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/gdb_builds/0.1/gdb-win-builds.tgz",
           "checksum": {
             "sha1": "94c78870edcd50f95bb0db040252e766bb275c50"
           },
@@ -60,7 +60,7 @@
       "version": 14,
       "archives": [
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_14_1052/naclsdk_mac.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_14_1052/naclsdk_mac.tgz",
           "checksum": {
             "sha1": "e4b12fcb2dde33ff8b56e9ac3b83830a46205880"
           },
@@ -68,7 +68,7 @@
           "size": 51242839
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_14_1052/naclsdk_linux.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_14_1052/naclsdk_linux.tgz",
           "checksum": {
             "sha1": "52e6dd6efbd060956ac62b20dc3ba4bf0d34bcca"
           },
@@ -76,7 +76,7 @@
           "size": 55819823
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_14_1052/naclsdk_win.exe",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_14_1052/naclsdk_win.exe",
           "checksum": {
             "sha1": "9451dae079d19c7c5b270a4557aeec5d964858b7"
           },
@@ -94,7 +94,7 @@
       "version": 15,
       "archives": [
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_15_1239/naclsdk_mac.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_15_1239/naclsdk_mac.tgz",
           "checksum": {
             "sha1": "605888f7d0e1055dd0be9a7366b61467fcb74804"
           },
@@ -102,7 +102,7 @@
           "size": 149170725
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_15_1239/naclsdk_linux.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_15_1239/naclsdk_linux.tgz",
           "checksum": {
             "sha1": "9a118167b20fe7ada0c4cd735e7d7200970b9b01"
           },
@@ -110,7 +110,7 @@
           "size": 151245433
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_15_1239/naclsdk_win.exe",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_15_1239/naclsdk_win.exe",
           "checksum": {
             "sha1": "0843e07989a9cf4afebde75a4b15cfaf2804fd27"
           },
@@ -128,7 +128,7 @@
       "version": 16,
       "archives": [
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_16_1398/naclsdk_mac.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_16_1398/naclsdk_mac.tgz",
           "checksum": {
             "sha1": "2fd1fefaea8e583d54b221929c45833d20309ec3"
           },
@@ -136,7 +136,7 @@
           "size": 150292794
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_16_1398/naclsdk_linux.tgz",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_16_1398/naclsdk_linux.tgz",
           "checksum": {
             "sha1": "222e11cbc6406209936cad26f4013dfa33eb77cf"
           },
@@ -144,7 +144,7 @@
           "size": 151546130
         },
         {
-          "url": "http://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_16_1398/naclsdk_win.exe",
+          "url": "http://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/pepper_16_1398/naclsdk_win.exe",
           "checksum": {
             "sha1": "76088b2c4c6ca0fbac3c3fd68930c9a94a25351a"
           },
@@ -162,7 +162,7 @@
       "version": 17,
       "archives": [
         {
-          "url": "https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.112997/naclsdk_mac.tgz",
+          "url": "https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.112997/naclsdk_mac.tgz",
           "checksum": {
             "sha1": "ca8f1462d273405d87de857cad82c9964285c3a8"
           },
@@ -170,7 +170,7 @@
           "size": 143931310
         },
         {
-          "url": "https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.112997/naclsdk_linux.tgz",
+          "url": "https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.112997/naclsdk_linux.tgz",
           "checksum": {
             "sha1": "610200cb6c64556099936aaa4ac660b782a8c170"
           },
@@ -178,7 +178,7 @@
           "size": 142672469
         },
         {
-          "url": "https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.112997/naclsdk_win.exe",
+          "url": "https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.112997/naclsdk_win.exe",
           "checksum": {
             "sha1": "6690ad707fe22ea7709d7411af2815ab35036e86"
           },
diff --git a/native_client_sdk/src/build_tools/json/naclsdk_manifest0.json b/native_client_sdk/src/build_tools/json/naclsdk_manifest0.json
index a92c644..e192217 100644
--- a/native_client_sdk/src/build_tools/json/naclsdk_manifest0.json
+++ b/native_client_sdk/src/build_tools/json/naclsdk_manifest0.json
@@ -8,7 +8,7 @@
           },
           "host_os": "all",
           "size": 29619,
-          "url": "https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.228691/sdk_tools.tgz"
+          "url": "https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.228691/sdk_tools.tgz"
         }
       ],
       "description": "Native Client SDK Tools, revision 228691",
diff --git a/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json b/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json
index 7aab06c..d8fe4c9 100644
--- a/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json
+++ b/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json
@@ -8,7 +8,7 @@
           },
           "host_os": "all",
           "size": 29619,
-          "url": "https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.228691/sdk_tools.tgz"
+          "url": "https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/trunk.228691/sdk_tools.tgz"
         }
       ],
       "description": "Native Client SDK Tools, revision 228691",
@@ -22,7 +22,7 @@
       "archives": [
         {
           "host_os": "win",
-          "url": "https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/sdk/${revision}/vs_addin.tgz"
+          "url": "https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/sdk/${revision}/vs_addin.tgz"
         }
       ],
       "description": "Visual Studio Add-In for building and debugging NaCl applications",
diff --git a/native_client_sdk/src/build_tools/nacl-mono-buildbot.py b/native_client_sdk/src/build_tools/nacl-mono-buildbot.py
index 8c104db..23645c5 100755
--- a/native_client_sdk/src/build_tools/nacl-mono-buildbot.py
+++ b/native_client_sdk/src/build_tools/nacl-mono-buildbot.py
@@ -131,7 +131,7 @@ def update_mono_sdk_json(infos):
     f.close()
     archive['checksum'] = { 'sha1': sha1_hash.hexdigest() }
     archive['host_os'] = 'all'
-    archive['url'] = ('https://commondatastorage.googleapis.com/'
+    archive['url'] = ('https://storage.googleapis.com/'
                       'nativeclient-mirror/nacl/nacl_sdk/%s/%s/%s.bz2'
                       % (info['naclmono_name'], info['naclmono_rev'],
                         info['naclmono_name']))
diff --git a/native_client_sdk/src/build_tools/nacl-mono-builder.py b/native_client_sdk/src/build_tools/nacl-mono-builder.py
index 731b194..58a3500 100755
--- a/native_client_sdk/src/build_tools/nacl-mono-builder.py
+++ b/native_client_sdk/src/build_tools/nacl-mono-builder.py
@@ -58,8 +58,7 @@ def main(args):
     sdk_url = 'gs://nativeclient-mirror/nacl/nacl_sdk/'\
               'trunk.%s/naclsdk_linux.tar.bz2' % sdk_revision
 
-  sdk_url = sdk_url.replace('https://commondatastorage.googleapis.com/',
-                            'gs://')
+  sdk_url = sdk_url.replace('https://storage.googleapis.com/', 'gs://')
 
   sdk_file = sdk_url.split('/')[-1]
 
diff --git a/native_client_sdk/src/build_tools/sdk_tools/cacerts.txt b/native_client_sdk/src/build_tools/sdk_tools/cacerts.txt
index 4f17203..b69ee03 100644
--- a/native_client_sdk/src/build_tools/sdk_tools/cacerts.txt
+++ b/native_client_sdk/src/build_tools/sdk_tools/cacerts.txt
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 # The following SSL certificates are used to validate the SSL connection
-# to https://commondatastorage.googleapis.com
+# to https://storage.googleapis.com
 
 EQUIFAX_SECURE_CA_CERTIFICATE
 
diff --git a/native_client_sdk/src/build_tools/sdk_tools/config.py b/native_client_sdk/src/build_tools/sdk_tools/config.py
index 6fc9be07..c87be58 100644
--- a/native_client_sdk/src/build_tools/sdk_tools/config.py
+++ b/native_client_sdk/src/build_tools/sdk_tools/config.py
@@ -9,7 +9,7 @@ from sdk_update_common import Error
 
 SOURCE_WHITELIST = [
   'http://localhost/',  # For testing.
-  'https://commondatastorage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk',
+  'https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk',
 ]
 
 def IsSourceValid(url):
diff --git a/native_client_sdk/src/build_tools/sdk_tools/sdk_update_main.py b/native_client_sdk/src/build_tools/sdk_tools/sdk_update_main.py
index a707654..0832946 100755
--- a/native_client_sdk/src/build_tools/sdk_tools/sdk_update_main.py
+++ b/native_client_sdk/src/build_tools/sdk_tools/sdk_update_main.py
@@ -34,7 +34,7 @@ import command.update
 # This revision number is autogenerated from the Chrome revision.
 REVISION = '{REVISION}'
 
-GSTORE_URL = 'https://commondatastorage.googleapis.com/nativeclient-mirror'
+GSTORE_URL = 'https://storage.googleapis.com/nativeclient-mirror'
 CONFIG_FILENAME = 'naclsdk_config.json'
 MANIFEST_FILENAME = 'naclsdk_manifest2.json'
 DEFAULT_SDK_ROOT = os.path.abspath(PARENT_DIR)
diff --git a/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py b/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py
index de292d1..9b85bd6 100755
--- a/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py
+++ b/native_client_sdk/src/build_tools/tests/update_nacl_manifest_test.py
@@ -24,7 +24,7 @@ import update_nacl_manifest
 from update_nacl_manifest import CANARY_BUNDLE_NAME
 
 
-HTTPS_BASE_URL = 'https://commondatastorage.googleapis.com' \
+HTTPS_BASE_URL = 'https://storage.googleapis.com' \
     '/nativeclient_mirror/nacl/nacl_sdk/'
 
 OS_CR = ('cros',)
diff --git a/native_client_sdk/src/build_tools/update_nacl_manifest.py b/native_client_sdk/src/build_tools/update_nacl_manifest.py
index 07430f4..465c44a 100755
--- a/native_client_sdk/src/build_tools/update_nacl_manifest.py
+++ b/native_client_sdk/src/build_tools/update_nacl_manifest.py
@@ -153,7 +153,7 @@ class Delegate(object):
     """Runs gsutil ls |url|
 
     Args:
-      url: The commondatastorage url to list.
+      url: The cloud storage url to list.
     Returns:
       A list of URLs, all with the gs:// schema."""
     raise NotImplementedError()
@@ -162,7 +162,7 @@ class Delegate(object):
     """Runs gsutil cat |url|
 
     Args:
-      url: The commondatastorage url to read from.
+      url: The cloud storage url to read from.
     Returns:
       A string with the contents of the file at |url|."""
     raise NotImplementedError()
diff --git a/native_client_sdk/src/build_tools/update_sdktools.py b/native_client_sdk/src/build_tools/update_sdktools.py
index 6007ae9..808aa1b 100755
--- a/native_client_sdk/src/build_tools/update_sdktools.py
+++ b/native_client_sdk/src/build_tools/update_sdktools.py
@@ -13,7 +13,7 @@ new sdk_tools bundle. A file on the developer's hard drive is modified, and
 must be checked in for the new sdk_tools bundle to be used.
 
 update_nacl_manifest.py is customarily run by a cron job, and does not check in
-any changes. Instead it modifies the manifest file in commondatastorage."""
+any changes. Instead it modifies the manifest file in cloud storage."""
 
 
 import collections
@@ -31,7 +31,7 @@ from update_nacl_manifest import RealDelegate
 SDK_TOOLS_DESCRIPTION_FORMAT = 'Native Client SDK Tools, revision %d'
 BUCKET_PATH = 'nativeclient-mirror/nacl/nacl_sdk/'
 GS_BUCKET_PATH = 'gs://' + BUCKET_PATH
-HTTPS_BUCKET_PATH = 'https://commondatastorage.googleapis.com/' + BUCKET_PATH
+HTTPS_BUCKET_PATH = 'https://storage.googleapis.com/' + BUCKET_PATH
 
 
 def GetSdkToolsUrl(revision):
diff --git a/native_client_sdk/src/gonacl_appengine/README b/native_client_sdk/src/gonacl_appengine/README
index 2343b0f8..d751632 100644
--- a/native_client_sdk/src/gonacl_appengine/README
+++ b/native_client_sdk/src/gonacl_appengine/README
@@ -37,8 +37,7 @@ To Update the Binary files (.pexe/.nmf)
 ---------------------------------------
 
 The build outputs are automatically uploaded to Google Cloud Storage
-(``commondatastorage.googleapis.com``) by the linux SDK builder
-(linux-sdk-multi).
+(``storage.googleapis.com``) by the linux SDK builder (linux-sdk-multi).
 To publish a new version:
 
 1. Make and land your change to the demo, found in ``src/<demo-name>``.
diff --git a/native_client_sdk/src/gonacl_appengine/src/Makefile b/native_client_sdk/src/gonacl_appengine/src/Makefile
index 3eea227..8d96bdc 100644
--- a/native_client_sdk/src/gonacl_appengine/src/Makefile
+++ b/native_client_sdk/src/gonacl_appengine/src/Makefile
@@ -4,7 +4,7 @@
 
 #
 # This script allows you to build, upload, and publish demo binaries that will
-# go on Google Cloud Storage (commondatastorage).
+# go on Google Cloud Storage.
 #
 # NOTE: you normally should not upload examples. This will be done
 # automatically by the buildbots.
diff --git a/native_client_sdk/src/gonacl_appengine/static/bullet/index.html b/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
index 344e924..457a764 100644
--- a/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/bullet/index.html
@@ -16,7 +16,7 @@
 
     <script type="text/javascript" src="NaClAM.js"></script>
     <script type="text/javascript" src="NaClAMBullet.js"></script>
-    <script type="text/javascript" src="//commondatastorage.googleapis.com/gonacl/pnacl-demo-bullet/three.min.js"></script>
+    <script type="text/javascript" src="//storage.googleapis.com/gonacl/pnacl-demo-bullet/three.min.js"></script>
     <script type="text/javascript" src="scene.js"></script>
     <script type="text/javascript" src="world.js"></script>
     <script type="text/javascript" src="scenes.js"></script>
diff --git a/native_client_sdk/src/gonacl_appengine/static/bullet/main.js b/native_client_sdk/src/gonacl_appengine/static/bullet/main.js
index 6e80a14..be2413c 100644
--- a/native_client_sdk/src/gonacl_appengine/static/bullet/main.js
+++ b/native_client_sdk/src/gonacl_appengine/static/bullet/main.js
@@ -65,7 +65,7 @@ function pageDidLoad() {
   embedWrap.addEventListener('crash', moduleCrash, true);
 
   var revision = 236779;
-  var url = '//commondatastorage.googleapis.com/gonacl/demos/publish/' +
+  var url = '//storage.googleapis.com/gonacl/demos/publish/' +
       revision + '/bullet/NaClAMBullet.nmf';
 
   var embed = document.createElement('embed');
diff --git a/native_client_sdk/src/gonacl_appengine/static/cube/example.js b/native_client_sdk/src/gonacl_appengine/static/cube/example.js
index 562f75c..04e52ed9 100644
--- a/native_client_sdk/src/gonacl_appengine/static/cube/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/cube/example.js
@@ -43,7 +43,7 @@ function browserSupportsPNaCl() {
  */
 function getDataURL(name) {
   var revision = '236779';
-  var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
+  var baseUrl = '//storage.googleapis.com/gonacl/demos/publish/';
   return baseUrl + revision + '/cube/' + name;
 }
 
diff --git a/native_client_sdk/src/gonacl_appengine/static/earth/example.js b/native_client_sdk/src/gonacl_appengine/static/earth/example.js
index ef8345b..629a321 100644
--- a/native_client_sdk/src/gonacl_appengine/static/earth/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/earth/example.js
@@ -43,7 +43,7 @@ function browserSupportsPNaCl() {
  */
 function getDataURL(name) {
   var revision = '236779';
-  var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
+  var baseUrl = '//storage.googleapis.com/gonacl/demos/publish/';
   return baseUrl + revision + '/earth/' + name;
 }
 
diff --git a/native_client_sdk/src/gonacl_appengine/static/life/example.js b/native_client_sdk/src/gonacl_appengine/static/life/example.js
index 8cbfdd4..c6231e2 100644
--- a/native_client_sdk/src/gonacl_appengine/static/life/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/life/example.js
@@ -43,7 +43,7 @@ function browserSupportsPNaCl() {
  */
 function getDataURL(name) {
   var revision = '236779';
-  var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
+  var baseUrl = '//storage.googleapis.com/gonacl/demos/publish/';
   return baseUrl + revision + '/life/' + name;
 }
 
diff --git a/native_client_sdk/src/gonacl_appengine/static/lua/index.html b/native_client_sdk/src/gonacl_appengine/static/lua/index.html
index e3512ae..4bd8eb9 100644
--- a/native_client_sdk/src/gonacl_appengine/static/lua/index.html
+++ b/native_client_sdk/src/gonacl_appengine/static/lua/index.html
@@ -13,7 +13,7 @@
     <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:300,700">
     <link href="/static/styles/style.css" rel="stylesheet">
 
-    <script type="text/javascript" src="//commondatastorage.googleapis.com/gonacl/demos/publish/234230_dev/lua/hterm.concat.js"></script>
+    <script type="text/javascript" src="//storage.googleapis.com/gonacl/demos/publish/234230_dev/lua/hterm.concat.js"></script>
     <script type="text/javascript" src="naclterm.js"></script>
     <script type="text/javascript" src="lua.js"></script>
 
diff --git a/native_client_sdk/src/gonacl_appengine/static/lua/lua.js b/native_client_sdk/src/gonacl_appengine/static/lua/lua.js
index 9ba0e96..9177d39 100644
--- a/native_client_sdk/src/gonacl_appengine/static/lua/lua.js
+++ b/native_client_sdk/src/gonacl_appengine/static/lua/lua.js
@@ -5,7 +5,7 @@
  */
 
 NaClTerm.prefix = 'lua'
-NaClTerm.nmf = '//commondatastorage.googleapis.com/gonacl/demos/publish/234230_dev/lua/lua.nmf'
+NaClTerm.nmf = '//storage.googleapis.com/gonacl/demos/publish/234230_dev/lua/lua.nmf'
 
 window.onload = function() {
   lib.init(function() {
diff --git a/native_client_sdk/src/gonacl_appengine/static/lua/naclterm.js b/native_client_sdk/src/gonacl_appengine/static/lua/naclterm.js
index eae6b4a..51eaac9 100644
--- a/native_client_sdk/src/gonacl_appengine/static/lua/naclterm.js
+++ b/native_client_sdk/src/gonacl_appengine/static/lua/naclterm.js
@@ -232,7 +232,7 @@ NaClTerm.prototype.createEmbed = function(width, height) {
   addParam('PS_VERBOSITY', '2');
   addParam('PS_EXIT_MESSAGE', 'exited');
   addParam('TERM', 'xterm-256color');
-  addParam('LUA_DATA_URL', 'http://commondatastorage.googleapis.com/gonacl/demos/publish/234230_dev/lua');
+  addParam('LUA_DATA_URL', 'http://storage.googleapis.com/gonacl/demos/publish/234230_dev/lua');
 
   // Add ARGV arguments from query parameters.
   var args = lib.f.parseQuery(document.location.search);
diff --git a/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js b/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js
index e8f65a1..6eab233 100644
--- a/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/smoothlife/example.js
@@ -74,7 +74,7 @@ function browserSupportsPNaCl() {
  */
 function getDataURL(name) {
   var revision = '236779';
-  var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
+  var baseUrl = '//storage.googleapis.com/gonacl/demos/publish/';
   return baseUrl + revision + '/smoothlife/' + name;
 }
 
diff --git a/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js b/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js
index 6769e9b..8eeb7ee 100644
--- a/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js
+++ b/native_client_sdk/src/gonacl_appengine/static/voronoi/example.js
@@ -43,7 +43,7 @@ function browserSupportsPNaCl() {
  */
 function getDataURL(name) {
   var revision = '236779';
-  var baseUrl = '//commondatastorage.googleapis.com/gonacl/demos/publish/';
+  var baseUrl = '//storage.googleapis.com/gonacl/demos/publish/';
   return baseUrl + revision + '/voronoi/' + name;
 }