Make platform app restrictions more robust.

chrome/test/data/extensions/platform_apps/restrictions/test.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 fail = chrome.test.fail;
 var succeed = chrome.test.succeed;
 
 var DEFAULT_EXPECTED_ERROR = "Not available for platform apps.";
 
@@ skipping 15 matching lines @@
   function testDocumentClose() {
     assertThrowsError(document.close);
     succeed();
   },
 
   function testDocumentWrite() {
     assertThrowsError(document.write);
     succeed();
   },
 
-  function testWindowHistoryOpen() {
-    assertThrowsError(window.history.open);
-    assertThrowsError(history.open);
-    succeed();
-  },
-
   function testWindowHistoryBack() {
     assertThrowsError(window.history.back);
     assertThrowsError(history.back);
     succeed();
   },
 
   function testWindowHistoryForward() {
     assertThrowsError(window.history.forward);
     assertThrowsError(history.forward);
     succeed();
@@ skipping 21 matching lines @@
 
   function testWindowHistoryState() {
     assertThrowsError(function() {
       var state = window.history.state;
       state = history.state;
     });
     succeed();
   },
 
   function testWindowFind() {
+    assertThrowsError(Window.prototype.find);
     assertThrowsError(window.find);
     assertThrowsError(find);
     succeed();
   },
 
   function testWindowAlert() {
+    assertThrowsError(Window.prototype.alert);
     assertThrowsError(window.alert);
     assertThrowsError(alert);
     succeed();
   },
 
   function testWindowConfirm() {
+    assertThrowsError(Window.prototype.confirm);
     assertThrowsError(window.confirm);
     assertThrowsError(confirm);
     succeed();
   },
 
   function testWindowPrompt() {
+    assertThrowsError(Window.prototype.prompt);
     assertThrowsError(window.prompt);
     assertThrowsError(prompt);
     succeed();
   },
 
+  function testBars() {
+    var bars = ['locationbar', 'menubar', 'personalbar',
+                'scrollbars', 'statusbar', 'toolbar'];
+    for (var x = 0; x < bars.length; x++) {
+      assertThrowsError(function() {
+        var visible = this[bars[x]].visible;
+        visible = window[bars[x]].visible;
+      });
+    }
+    succeed();
+  },
+
   function testBlockedEvents() {
     var eventHandler = function() { fail('event handled'); };
     var blockedEvents = ['unload', 'beforeunload'];
 
     for (var i = 0; i < blockedEvents.length; ++i) {
       assertThrowsError(function() {
         window['on' + blockedEvents[i]] = eventHandler;
       });
       assertThrowsError(function() {
         window.addEventListener(blockedEvents[i], eventHandler);
       });
+      assertThrowsError(function() {
+        Window.prototype.addEventListener.apply(window,
+            [blockedEvents[i], eventHandler]);
+      });
     }
 
     succeed();
   },
 
-  function testBars() {
-    var bars = ['locationbar', 'menubar', 'personalbar',
-                'scrollbars', 'statusbar', 'toolbar'];
-    for (var x = 0; x < bars.length; x++) {
-      assertThrowsError(function() {
-        var visible = this[bars[x]].visible;
-        visible = window[bars[x]].visible;
-      });
-    }
-    succeed();
-  },
-
   function testSyncXhr() {
     var xhr = new XMLHttpRequest();
     assertThrowsError(function() {
       xhr.open('GET', 'data:should not load', false);
     }, 'INVALID_ACCESS_ERR: DOM Exception 15');
     succeed();
   }
 ]);