diff options
author | Daichi Hirono <hirono@chromium.org> | 2014-11-13 17:06:53 +0900 |
---|---|---|
committer | Daichi Hirono <hirono@chromium.org> | 2014-11-13 08:08:30 +0000 |
commit | 6ab35baed6e1f6f7184ff284c3261ed1c5cc60ed (patch) | |
tree | ff37a2635527282f3a85487f393925dc513f965f | |
parent | e286b498b1b32d7f6335bad08308d6fa4e6147ba (diff) | |
download | chromium_src-6ab35baed6e1f6f7184ff284c3261ed1c5cc60ed.zip chromium_src-6ab35baed6e1f6f7184ff284c3261ed1c5cc60ed.tar.gz chromium_src-6ab35baed6e1f6f7184ff284c3261ed1c5cc60ed.tar.bz2 |
Files.app: Use "ready" message instead of "worker-initialized" for waiting initialization in SelectFileAndCancel test.
The current message "worker-initialized" does not ensure the whole initialize
process completed in Files.app, and it causes races in the test after the
refactoring of crbug.com/267281.
BUG=432029
TEST=Run SelectFileAndCancel
TBR=sky
Review URL: https://codereview.chromium.org/714813002
Cr-Commit-Position: refs/heads/master@{#303788}
(cherry picked from commit 8866b6d59454363b687d8c6b099d6c663a78d66c)
Review URL: https://codereview.chromium.org/726483002
Cr-Commit-Position: refs/branch-heads/2214@{#26}
Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
-rw-r--r-- | chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc index 7c1ede9..40c5167 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension_browsertest.cc @@ -138,8 +138,7 @@ class SelectFileDialogExtensionBrowserTest : public ExtensionBrowserTest { const std::string& additional_message) { // Spawn a dialog to open a file. The dialog will signal that it is ready // via chrome.test.sendMessage() in the extension JavaScript. - ExtensionTestMessageListener init_listener("worker-initialized", - false /* will_reply */); + ExtensionTestMessageListener init_listener("ready", false /* will_reply */); scoped_ptr<ExtensionTestMessageListener> additional_listener; if (!additional_message.empty()) { @@ -278,8 +277,6 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, // Spawn a dialog to open a file. Provide the path to the file so the dialog // will automatically select it. Ensure that the OK button is enabled by // waiting for chrome.test.sendMessage('selection-change-complete'). - // The extension starts a Web Worker to read file metadata, so it may send - // 'selection-change-complete' before 'worker-initialized'. This is OK. ASSERT_NO_FATAL_FAILURE(OpenDialog(ui::SelectFileDialog::SELECT_OPEN_FILE, test_file, owning_window, "selection-change-complete")); @@ -306,8 +303,6 @@ IN_PROC_BROWSER_TEST_F(SelectFileDialogExtensionBrowserTest, // Spawn a dialog to save a file, providing a suggested path. // Ensure "Save" button is enabled by waiting for notification from // chrome.test.sendMessage(). - // The extension starts a Web Worker to read file metadata, so it may send - // 'directory-change-complete' before 'worker-initialized'. This is OK. ASSERT_NO_FATAL_FAILURE(OpenDialog(ui::SelectFileDialog::SELECT_SAVEAS_FILE, test_file, owning_window, "directory-change-complete")); |