[NaCl SDK] Set "recommended" tag to "yes" automatically for stable pepper bundle.

BUG=none
TEST=none
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/10764002

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

3 files changed, 21 insertions, 16 deletions

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 98e3ae9..b40d224 100644
--- a/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json
+++ b/native_client_sdk/src/build_tools/json/naclsdk_manifest2.json
@@ -158,8 +158,8 @@
     {
       "name": "pepper_19",
       "description": "Chrome 19 bundle, revision 129248",
-      "stability": "stable",
-      "recommended": "yes",
+      "stability": "post_stable",
+      "recommended": "no",
       "version": 19,
       "repath": "pepper_19",
       "archives": [
@@ -193,8 +193,8 @@
     {
       "name": "pepper_20",
       "description": "Chrome 20 bundle, revision xxxxx",
-      "stability": "beta",
-      "recommended": "no",
+      "stability": "stable",
+      "recommended": "yes",
       "version": 20,
       "repath": "pepper_20",
       "archives": [],
@@ -203,7 +203,7 @@
     {
       "name": "pepper_21",
       "description": "Chrome 21 bundle, revision xxxxx",
-      "stability": "dev",
+      "stability": "beta",
       "recommended": "no",
       "version": 21,
       "repath": "pepper_21",
diff --git a/native_client_sdk/src/build_tools/tests/test_update_manifest.py b/native_client_sdk/src/build_tools/tests/test_update_manifest.py
index 600e63e..9feac9b 100755
--- a/native_client_sdk/src/build_tools/tests/test_update_manifest.py
+++ b/native_client_sdk/src/build_tools/tests/test_update_manifest.py
@@ -324,15 +324,15 @@ class TestUpdateManifest(unittest.TestCase):
 
   def testUpdateTwoBundles(self):
     self.manifest = MakeManifest(B18_R1_NONE, B19_R1_NONE)
-    self.history.Add(OS_MLW, BETA, V19_0_1084_41)
-    self.history.Add(OS_MLW, STABLE, V18_0_1025_163)
+    self.history.Add(OS_MLW, DEV, V19_0_1084_41)
+    self.history.Add(OS_MLW, BETA, V18_0_1025_163)
     self.files.Add(B18_0_1025_163_R1_MLW)
     self.files.Add(B19_0_1084_41_R1_MLW)
     self._MakeDelegate()
     self._Run(OS_MLW)
     self._ReadUploadedManifest()
-    self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, STABLE)
-    self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, BETA)
+    self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA)
+    self._AssertUploadedManifestHasBundle(B19_0_1084_41_R1_MLW, DEV)
     self.assertEqual(len(self.uploaded_manifest.GetBundles()), 2)
 
   def testUpdateWithMissingPlatformsInArchives(self):
@@ -359,20 +359,22 @@ class TestUpdateManifest(unittest.TestCase):
     self._AssertUploadedManifestHasBundle(B18_0_1025_163_R1_MLW, BETA)
     self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1)
 
-  def testRecommendedIsMaintained(self):
-    for recommended in 'yes', 'no':
+  def testRecommendedIsStable(self):
+    for channel in STABLE, BETA, DEV, CANARY:
       self.setUp()
       bundle = copy.deepcopy(B18_R1_NONE)
-      bundle.recommended = recommended
       self.manifest = MakeManifest(bundle)
-      self.history.Add(OS_MLW, BETA, V18_0_1025_163)
+      self.history.Add(OS_MLW, channel, V18_0_1025_163)
       self.files.Add(B18_0_1025_163_R1_MLW)
       self._MakeDelegate()
       self._Run(OS_MLW)
       self._ReadUploadedManifest()
       self.assertEqual(len(self.uploaded_manifest.GetBundles()), 1)
       uploaded_bundle = self.uploaded_manifest.GetBundle('pepper_18')
-      self.assertEqual(uploaded_bundle.recommended, recommended)
+      if channel == STABLE:
+        self.assertEqual(uploaded_bundle.recommended, 'yes')
+      else:
+        self.assertEqual(uploaded_bundle.recommended, 'no')
 
   def testNoUpdateWithNonPepperBundle(self):
     self.manifest = MakeManifest(NON_PEPPER_BUNDLE_NOARCHIVES,
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 9f7af059..8147077 100755
--- a/native_client_sdk/src/build_tools/update_nacl_manifest.py
+++ b/native_client_sdk/src/build_tools/update_nacl_manifest.py
@@ -467,7 +467,6 @@ class Updater(object):
     for bundle_name, version, channel, archives in self.versions_to_update:
       self.delegate.Print('Updating %s to %s...' % (bundle_name, version))
       bundle = manifest.GetBundle(bundle_name)
-      bundle_recommended = bundle.recommended
       for archive in archives:
         platform_bundle = self._GetPlatformArchiveBundle(archive)
         # Normally the manifest snippet's bundle name matches our bundle name.
@@ -476,7 +475,11 @@ class Updater(object):
         platform_bundle.name = bundle_name
         bundle.MergeWithBundle(platform_bundle)
       bundle.stability = channel
-      bundle.recommended = bundle_recommended
+      # We always recommend the stable version.
+      if channel == 'stable':
+        bundle.recommended = 'yes'
+      else:
+        bundle.recommended = 'no'
       manifest.MergeBundle(bundle)
     self._UploadManifest(manifest)
     self.delegate.Print('Done.')