Commit 2eb933a0 authored by Noel Gordon's avatar Noel Gordon Committed by Commit Bot

Rename command installProviderExtension to launchProviderExtension

crrev.com/555016 changed the C++ browser-test-side code to use the name
LaunchExtension(), rather than InstallExtension(). Change the test code
JS command similarly, use launchProviderExtension.

Also make launchProviderExtension a separate getSetupSteps step because
chrome test.sendMessage always has a reply. We should await it and then
do the next step: setup that next step to call setupAndWaitUntilReady()
as before.

Covered by existing tests: Provider/FileManagerBrowserTest/Test.*

Bug: 833834,668680
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I0cffa47ae94e46699fd1e92d69dea946686d6ad1
Reviewed-on: https://chromium-review.googlesource.com/1036747Reviewed-by: default avatarStuart Langley <slangley@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555205}
parent dbc9021e
...@@ -761,7 +761,7 @@ void FileManagerBrowserTestBase::OnCommand(const std::string& name, ...@@ -761,7 +761,7 @@ void FileManagerBrowserTestBase::OnCommand(const std::string& name,
return; return;
} }
if (name == "installProviderExtension") { if (name == "launchProviderExtension") {
std::string manifest; std::string manifest;
ASSERT_TRUE(value.GetString("manifest", &manifest)); ASSERT_TRUE(value.GetString("manifest", &manifest));
LaunchExtension(base::FilePath(FILE_PATH_LITERAL( LaunchExtension(base::FilePath(FILE_PATH_LITERAL(
......
...@@ -10,8 +10,8 @@ var appId; ...@@ -10,8 +10,8 @@ var appId;
/** /**
* Returns steps for initializing test cases. * Returns steps for initializing test cases.
* @param {string} manifest Name of the manifest to load for the testing * @param {string} manifest The manifest name of testing provider extension
* provider extension. * to launch for the test case.
* @return {!Array<function>} * @return {!Array<function>}
*/ */
function getSetupSteps(manifest) { function getSetupSteps(manifest) {
...@@ -19,9 +19,11 @@ function getSetupSteps(manifest) { ...@@ -19,9 +19,11 @@ function getSetupSteps(manifest) {
function() { function() {
chrome.test.sendMessage( chrome.test.sendMessage(
JSON.stringify({ JSON.stringify({
name: 'installProviderExtension', name: 'launchProviderExtension',
manifest: manifest manifest: manifest
})); }), this.next);
},
function() {
setupAndWaitUntilReady(null, RootPath.DOWNLOADS, this.next); setupAndWaitUntilReady(null, RootPath.DOWNLOADS, this.next);
}, },
function(results) { function(results) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment