OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
| 5 #include "base/task.h" |
5 #include "base/path_service.h" | 6 #include "base/path_service.h" |
6 #include "chrome/browser/dom_ui/dom_ui.h" | 7 #include "chrome/browser/dom_ui/dom_ui.h" |
7 #include "chrome/browser/tab_contents/navigation_controller.h" | 8 #include "chrome/browser/tab_contents/navigation_controller.h" |
8 #include "chrome/browser/tab_contents/tab_contents.h" | 9 #include "chrome/browser/tab_contents/tab_contents.h" |
9 #include "chrome/browser/views/html_dialog_view.h" | 10 #include "chrome/browser/views/html_dialog_view.h" |
10 #include "chrome/common/chrome_paths.h" | 11 #include "chrome/common/chrome_paths.h" |
11 #include "chrome/common/notification_registrar.h" | 12 #include "chrome/common/notification_registrar.h" |
12 #include "chrome/common/url_constants.h" | 13 #include "chrome/common/url_constants.h" |
13 #include "chrome/test/in_process_browser_test.h" | 14 #include "chrome/test/in_process_browser_test.h" |
14 #include "chrome/test/ui_test_utils.h" | 15 #include "chrome/test/ui_test_utils.h" |
15 #include "net/test/test_server.h" | 16 #include "net/test/test_server.h" |
16 | 17 |
17 namespace { | 18 namespace { |
18 | 19 |
19 typedef DOMElementProxy::By By; | 20 typedef DOMElementProxy::By By; |
20 | 21 |
21 class FileBrowseBrowserTest : public InProcessBrowserTest { | 22 class FileBrowseBrowserTest : public InProcessBrowserTest { |
22 public: | 23 public: |
23 FileBrowseBrowserTest() { | 24 FileBrowseBrowserTest() { |
24 EnableDOMAutomation(); | 25 EnableDOMAutomation(); |
25 } | 26 } |
26 }; | 27 }; |
27 | 28 |
28 class FileBrowseUiObserver : public NotificationObserver { | 29 class FileBrowseUiObserver : public NotificationObserver { |
29 public: | 30 public: |
30 FileBrowseUiObserver() : file_browse_tab_(NULL), is_waiting_(false) { | 31 FileBrowseUiObserver() : file_browse_tab_(NULL), is_waiting_(false) { |
31 registrar_.Add(this, NotificationType::LOAD_STOP, | 32 registrar_.Add(this, NotificationType::LOAD_STOP, |
32 NotificationService::AllSources()); | 33 NotificationService::AllSources()); |
33 registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED, | 34 registrar_.Add(this, NotificationType::TAB_CONTENTS_DESTROYED, |
34 NotificationService::AllSources()); | 35 NotificationService::AllSources()); |
35 } | 36 } |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 observer.WaitForFileBrowseLoad(); | 121 observer.WaitForFileBrowseLoad(); |
121 DOMUI* file_browser_ui = observer.file_browse_ui(); | 122 DOMUI* file_browser_ui = observer.file_browse_ui(); |
122 ASSERT_TRUE(file_browser_ui); | 123 ASSERT_TRUE(file_browser_ui); |
123 | 124 |
124 file_browser_ui->CallJavascriptFunction(L"dialogCancelClick"); | 125 file_browser_ui->CallJavascriptFunction(L"dialogCancelClick"); |
125 | 126 |
126 observer.WaitForFileBrowseClose(); | 127 observer.WaitForFileBrowseClose(); |
127 } | 128 } |
128 | 129 |
129 } // namespace | 130 } // namespace |
OLD | NEW |