Index: extensions/test/data/web_view/dialog/embedder.js |
diff --git a/chrome/test/data/extensions/platform_apps/web_view/dialog/embedder.js b/extensions/test/data/web_view/dialog/embedder.js |
similarity index 93% |
copy from chrome/test/data/extensions/platform_apps/web_view/dialog/embedder.js |
copy to extensions/test/data/web_view/dialog/embedder.js |
index dafe3d0957a2abab25afb3318cc1d6729efb1761..2edda30dc855e95f21df975a5d415a668872c96c 100644 |
--- a/chrome/test/data/extensions/platform_apps/web_view/dialog/embedder.js |
+++ b/extensions/test/data/web_view/dialog/embedder.js |
@@ -105,7 +105,7 @@ function setUpDialogTest(messageCallback, dialogHandler) { |
// Tests begin. |
-function testAlertDialog() { |
+function testDialogAlert() { |
var messageText = '1337h@x0r'; |
var messageCallback = function(webview, data) { |
@@ -135,7 +135,7 @@ function testAlertDialog() { |
setUpDialogTest(messageCallback, dialogHandler); |
} |
-function testConfirmDialog() { |
+function testDialogConfirm() { |
var messageText = 'foobar'; |
var messageCallback = function(webview, data) { |
@@ -165,7 +165,7 @@ function testConfirmDialog() { |
setUpDialogTest(messageCallback, dialogHandler); |
} |
-function testConfirmDialogCancel() { |
+function testDialogConfirmCancel() { |
var messageText = 'foobar'; |
var messageCallback = function(webview, data) { |
@@ -195,7 +195,7 @@ function testConfirmDialogCancel() { |
setUpDialogTest(messageCallback, dialogHandler); |
} |
-function testConfirmDialogDefaultCancel() { |
+function testDialogConfirmDefaultCancel() { |
var messageText = 'foobar'; |
var messageCallback = function(webview, data) { |
@@ -223,7 +223,7 @@ function testConfirmDialogDefaultCancel() { |
setUpDialogTest(messageCallback, dialogHandler); |
} |
-function testConfirmDialogDefaultGCCancel() { |
+function testDialogConfirmDefaultGCCancel() { |
var messageText = 'foobar'; |
var messageCallback = function(webview, data) { |
@@ -254,7 +254,7 @@ function testConfirmDialogDefaultGCCancel() { |
setUpDialogTest(messageCallback, dialogHandler); |
} |
-function testPromptDialog() { |
+function testDialogPrompt() { |
var messageText = 'bleep'; |
var defaultPromptText = 'bloop'; |
var returnPromptText = 'blah'; |
@@ -288,16 +288,16 @@ function testPromptDialog() { |
} |
embedder.test.testList = { |
- 'testAlertDialog': testAlertDialog, |
- 'testConfirmDialog': testConfirmDialog, |
- 'testConfirmDialogDefaultCancel': testConfirmDialogDefaultCancel, |
- 'testConfirmDialogDefaultGCCancel': testConfirmDialogDefaultGCCancel, |
- 'testConfirmDialogCancel': testConfirmDialogCancel, |
- 'testPromptDialog': testPromptDialog |
+ 'testDialogAlert': testDialogAlert, |
+ 'testDialogConfirm': testDialogConfirm, |
+ 'testDialogConfirmCancel': testDialogConfirmCancel, |
+ 'testDialogConfirmDefaultCancel': testDialogConfirmDefaultCancel, |
+ 'testDialogConfirmDefaultGCCancel': testDialogConfirmDefaultGCCancel, |
+ 'testDialogPrompt': testDialogPrompt |
}; |
onload = function() { |
chrome.test.getConfig(function(config) { |
- chrome.test.sendMessage('Launched'); |
+ chrome.test.sendMessage('LAUNCHED'); |
}); |
}; |