[Extensions Bindings] Update optional permissions tests

chrome/test/data/extensions/api_test/permissions/optional/background.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var assertEq = chrome.test.assertEq;
 var assertFalse = chrome.test.assertFalse;
 var assertTrue = chrome.test.assertTrue;
 var assertThrows = chrome.test.assertThrows;
 var fail = chrome.test.callbackFail;
 var pass = chrome.test.callbackPass;
@@ skipping 178 matching lines @@
         assertTrue(permissions.permissions[0] == 'bookmarks');
       });
       chrome.permissions.remove(
           {permissions:['bookmarks']},
           pass(function() {
             chrome.permissions.getAll(pass(function(permissions) {
               assertTrue(checkPermSetsEq(initialPermissions, permissions));
             }));
             assertTrue(typeof chrome.bookmarks == 'object' &&
                        chrome.bookmarks != null);
-            assertThrows(
-              chrome.bookmarks.getTree, [function(){}],
-              "'bookmarks' requires a different Feature that is not present.");
+            var nativeBindingsError =
+                "'bookmarks.getTree' is not available in this context.";
+            var jsBindingsError =
+                "'bookmarks' requires a different Feature that is not present.";
+            var regexp =
+                new RegExp(nativeBindingsError + '|' + jsBindingsError);
+            assertThrows(chrome.bookmarks.getTree, [function(){}], regexp);
           }
       ));
     },
 
     // The user shouldn't have to approve permissions that have no warnings.
     function noPromptForNoWarnings() {
       chrome.permissions.request(
           {permissions: ['cookies']},
           pass(function(granted) {
         assertTrue(granted);
@@ skipping 76 matching lines @@
       listenOnce(chrome.permissions.onAdded,
                  function(permissions) {
         chrome.bookmarks.getTree(pass(function() {
           assertTrue(true);
         }));
       });
       listenOnce(chrome.permissions.onRemoved,
                  function(permissions) {
         assertTrue(typeof chrome.bookmarks == 'object' &&
                    chrome.bookmarks != null);
-        assertThrows(
-          chrome.bookmarks.getTree, [function(){}],
-          "'bookmarks' requires a different Feature that is not present.");
+        var nativeBindingsError =
+            "'bookmarks.getTree' is not available in this context.";
+        var jsBindingsError =
+            "'bookmarks' requires a different Feature that is not present.";
+        var regexp = new RegExp(nativeBindingsError + '|' + jsBindingsError);
+        assertThrows(chrome.bookmarks.getTree, [function(){}], regexp);
       });
 
       chrome.permissions.request(
           {permissions: ['bookmarks', 'management']}, pass(function(granted) {
         assertTrue(granted);
         chrome.permissions.remove(
             {permissions: ['bookmarks']}, pass(function() {
           assertTrue(true);
         }));
       }));
     }
 
   ]);
 });