Cleanup webview app_shell_browsertests and add webview media permission tests in app_shell_browsert…

extensions/test/data/web_view/media_access/allow/embedder.js

Index: extensions/test/data/web_view/media_access/allow/embedder.js
diff --git a/chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js b/extensions/test/data/web_view/media_access/allow/embedder.js
similarity index 92%
copy from chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js
copy to extensions/test/data/web_view/media_access/allow/embedder.js
index 0634bcf9b6295a21e4431aef73e44ef9110e1bb4..5faaca286fac9a33c5965aff5a59c7f9d7ba470a 100644
--- a/chrome/test/data/extensions/platform_apps/web_view/media_access/allow/embedder.js
+++ b/extensions/test/data/web_view/media_access/allow/embedder.js
@@ -4,20 +4,17 @@
 
 var embedder = {};
 embedder.tests = {};
-embedder.baseGuestURL = '';

[lazyboy, 2014/10/06 16:21:21]

I'd keep these two as they make things readable, i.e. one can assume there would
be "baseGuestURL" and "guestURL" defined under the "embedder" object, you can
add a comment saying "These will be filled in chrome.test.getConfig() below".

[lfg, 2014/10/06 16:53:18]

Done.

-embedder.guestURL = '';
 
 // Sends a message to WebViewTest denoting it is done and test
 // has failed.
 embedder.failTest = function(msg) {
-  window.console.log('test failure, reason: ' + msg);
+  window.console.warn('test failure, reason: ' + msg);
   chrome.test.sendMessage('TEST_FAILED');
 };
 
 // Sends a message to WebViewTest denoting it is done and test
 // has succeeded.
 embedder.maybePassTest = function() {
-  window.console.log('test passed');
   chrome.test.sendMessage('TEST_PASSED');
 };
 
@@ -137,6 +134,29 @@ embedder.tests.testAllowAndThenDeny = function() {
   embedder.setUpLoadStop_(webview, 'test1');
 };
 
+embedder.tests.testAllowAsync = function() {
+  var webview = embedder.setUpGuest_();
+  if (!webview) {
+    return;
+  }
+
+  var onPermissionRequest = function(e) {
+    if (!embedder.assertCorrectMediaEvent_(e)) {
+      return;
+    }
+
+    e.preventDefault();
+    // Decide asynchronously.
+    window.setTimeout(function() {
+      e.request.allow();
+      embedder.maybePassTest();
+    }, 0);
+  };
+  webview.addEventListener('permissionrequest', onPermissionRequest);
+
+  embedder.setUpLoadStop_(webview, 'test1');
+};
+
 embedder.tests.testAllowTwice = function() {
   var webview = embedder.setUpGuest_();
   if (!webview) {
@@ -180,43 +200,18 @@ embedder.tests.testAllowTwice = function() {
   embedder.setUpLoadStop_(webview, 'test1');
 };
 
-embedder.tests.testAllowAsync = function() {
-  var webview = embedder.setUpGuest_();
-  if (!webview) {
-    return;
-  }
-
-  var onPermissionRequest = function(e) {
-    if (!embedder.assertCorrectMediaEvent_(e)) {
-      return;
-    }
-
-    e.preventDefault();
-    // Decide asynchronously.
-    window.setTimeout(function() {
-      e.request.allow();
-      embedder.maybePassTest();
-    }, 0);
-  };
-  webview.addEventListener('permissionrequest', onPermissionRequest);
-
-  embedder.setUpLoadStop_(webview, 'test1');
-};
-
 embedder.tests.list = {
   'testAllow': embedder.tests.testAllow,
   'testAllowAndThenDeny': embedder.tests.testAllowAndThenDeny,
-  'testAllowTwice': embedder.tests.testAllowTwice,
-  'testAllowAsync': embedder.tests.testAllowAsync
+  'testAllowAsync': embedder.tests.testAllowAsync,
+  'testAllowTwice': embedder.tests.testAllowTwice
 };
 
 // Entry point for test, called by WebViewTest.
-function startAllowTest(testName) {
+function runTest(testName) {
   chrome.test.getConfig(function(config) {
     embedder.baseGuestURL = 'http://localhost:' + config.testServer.port;
-    embedder.guestURL = embedder.baseGuestURL +
-        '/extensions/platform_apps/web_view/media_access' +
-        '/media_access_guest.html';
+    embedder.guestURL = embedder.baseGuestURL + '/media_access_guest.html';
     chrome.test.log('Guest url is: ' + embedder.guestURL);
 
     var testFunction = embedder.tests.list[testName];
@@ -229,5 +224,5 @@ function startAllowTest(testName) {
 }
 
 onload = function() {
-  chrome.test.sendMessage('Launched');
+  chrome.test.sendMessage('LAUNCHED');
 };