Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 10 #include "chrome/grit/options_test_resources.h" | 10 #include "chrome/grit/options_test_resources.h" |
| 11 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
| 12 #include "chrome/test/base/ui_test_utils.h" | 12 #include "chrome/test/base/ui_test_utils.h" |
| 13 #include "content/public/browser/notification_registrar.h" | 13 #include "content/public/browser/notification_registrar.h" |
| 14 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
| 15 #include "content/public/test/browser_test_utils.h" | 15 #include "content/public/test/browser_test_utils.h" |
| 16 #include "grit/webui_test_resources.h" | |
|
Lei Zhang
2015/07/22 00:20:26
Can this be chrome/test/data/grit/webui_test_resou
Dan Beam
2015/07/22 00:26:41
grit/ is what almost everybody does:
https://code.
| |
| 16 #include "ui/base/resource/resource_bundle.h" | 17 #include "ui/base/resource/resource_bundle.h" |
| 17 #include "ui/resources/grit/webui_resources.h" | 18 #include "ui/resources/grit/webui_resources.h" |
| 18 | 19 |
| 19 class WebUIResourceBrowserTest : public InProcessBrowserTest { | 20 class WebUIResourceBrowserTest : public InProcessBrowserTest { |
| 20 public: | 21 public: |
| 21 void SetUpOnMainThread() override { | 22 void SetUpOnMainThread() override { |
| 22 // Load resources that are only used by browser_tests. | 23 // Load resources that are only used by browser_tests. |
| 23 base::FilePath pak_path; | 24 base::FilePath pak_path; |
| 24 ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &pak_path)); | 25 ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &pak_path)); |
| 25 pak_path = pak_path.AppendASCII("browser_tests.pak"); | 26 pak_path = pak_path.AppendASCII("browser_tests.pak"); |
| 26 ResourceBundle::GetSharedInstance().AddDataPackFromPath( | 27 ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
| 27 pak_path, ui::SCALE_FACTOR_NONE); | 28 pak_path, ui::SCALE_FACTOR_NONE); |
| 28 } | 29 } |
| 29 | 30 |
| 30 // Runs all test functions in |file|, waiting for them to complete. | 31 // Runs all test functions in |file|, waiting for them to complete. |
| 31 void RunTest(const base::FilePath& file) { | 32 void LoadFile(const base::FilePath& file) { |
| 32 GURL url = ui_test_utils::GetTestUrl( | 33 base::FilePath webui(FILE_PATH_LITERAL("webui")); |
| 33 base::FilePath(FILE_PATH_LITERAL("webui")), file); | 34 RunTest(ui_test_utils::GetTestUrl(webui, file)); |
| 34 ui_test_utils::NavigateToURL(browser(), url); | 35 } |
| 35 | 36 |
| 36 content::WebContents* web_contents = | 37 void LoadResource(int idr) { |
| 37 browser()->tab_strip_model()->GetActiveWebContents(); | 38 ResourceBundle& bundle = ResourceBundle::GetSharedInstance(); |
| 38 ASSERT_TRUE(web_contents); | 39 base::StringPiece resource = bundle.GetRawDataResource(idr); |
| 39 EXPECT_TRUE(ExecuteWebUIResourceTest(web_contents, include_libraries_)); | 40 RunTest(GURL(std::string("data:text/html,") + resource.as_string())); |
| 40 } | 41 } |
| 41 | 42 |
| 42 // Queues the library corresponding to |resource_id| for injection into the | 43 // Queues the library corresponding to |resource_id| for injection into the |
| 43 // test. The code injection is performed post-load, so any common test | 44 // test. The code injection is performed post-load, so any common test |
| 44 // initialization that depends on the library should be placed in a setUp | 45 // initialization that depends on the library should be placed in a setUp |
| 45 // function. | 46 // function. |
| 46 void AddLibrary(int resource_id) { | 47 void AddLibrary(int resource_id) { |
| 47 include_libraries_.push_back(resource_id); | 48 include_libraries_.push_back(resource_id); |
| 48 } | 49 } |
| 49 | 50 |
| 50 private: | 51 private: |
| 52 void RunTest(const GURL& url) { | |
| 53 ui_test_utils::NavigateToURL(browser(), url); | |
| 54 content::WebContents* web_contents = | |
| 55 browser()->tab_strip_model()->GetActiveWebContents(); | |
| 56 ASSERT_TRUE(web_contents); | |
| 57 EXPECT_TRUE(ExecuteWebUIResourceTest(web_contents, include_libraries_)); | |
| 58 } | |
| 59 | |
| 51 // Resource IDs for internal javascript libraries to inject into the test. | 60 // Resource IDs for internal javascript libraries to inject into the test. |
| 52 std::vector<int> include_libraries_; | 61 std::vector<int> include_libraries_; |
| 53 }; | 62 }; |
| 54 | 63 |
| 55 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ArrayDataModelTest) { | 64 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ArrayDataModelTest) { |
| 56 AddLibrary(IDR_WEBUI_JS_CR); | 65 AddLibrary(IDR_WEBUI_JS_CR); |
| 57 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 66 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 58 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); | 67 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); |
| 59 RunTest(base::FilePath(FILE_PATH_LITERAL("array_data_model_test.html"))); | 68 LoadFile(base::FilePath(FILE_PATH_LITERAL("array_data_model_test.html"))); |
| 60 } | 69 } |
| 61 | 70 |
| 62 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, CrTest) { | 71 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, CrTest) { |
| 63 AddLibrary(IDR_WEBUI_JS_CR); | 72 AddLibrary(IDR_WEBUI_JS_CR); |
| 64 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 73 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 65 RunTest(base::FilePath(FILE_PATH_LITERAL("cr_test.html"))); | 74 LoadFile(base::FilePath(FILE_PATH_LITERAL("cr_test.html"))); |
| 66 } | 75 } |
| 67 | 76 |
| 68 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, EventTargetTest) { | 77 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, EventTargetTest) { |
| 69 AddLibrary(IDR_WEBUI_JS_CR); | 78 AddLibrary(IDR_WEBUI_JS_CR); |
| 70 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 79 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 71 RunTest(base::FilePath(FILE_PATH_LITERAL("event_target_test.html"))); | 80 LoadFile(base::FilePath(FILE_PATH_LITERAL("event_target_test.html"))); |
| 81 } | |
| 82 | |
| 83 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, I18nProcessCssTest) { | |
| 84 LoadResource(IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST); | |
| 72 } | 85 } |
| 73 | 86 |
| 74 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, I18nProcessTest) { | 87 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, I18nProcessTest) { |
| 75 AddLibrary(IDR_WEBUI_JS_LOAD_TIME_DATA); | 88 AddLibrary(IDR_WEBUI_JS_LOAD_TIME_DATA); |
| 76 AddLibrary(IDR_WEBUI_JS_I18N_TEMPLATE_NO_PROCESS); | 89 AddLibrary(IDR_WEBUI_JS_I18N_TEMPLATE_NO_PROCESS); |
| 77 AddLibrary(IDR_WEBUI_JS_UTIL); | 90 AddLibrary(IDR_WEBUI_JS_UTIL); |
| 78 RunTest(base::FilePath(FILE_PATH_LITERAL("i18n_process_test.html"))); | 91 LoadFile(base::FilePath(FILE_PATH_LITERAL("i18n_process_test.html"))); |
| 79 } | 92 } |
| 80 | 93 |
| 81 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListTest) { | 94 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListTest) { |
| 82 AddLibrary(IDR_WEBUI_JS_CR); | 95 AddLibrary(IDR_WEBUI_JS_CR); |
| 83 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 96 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 84 AddLibrary(IDR_WEBUI_JS_CR_UI); | 97 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 85 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); | 98 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); |
| 86 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM); | 99 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM); |
| 87 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER); | 100 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER); |
| 88 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); | 101 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); |
| 89 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST); | 102 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST); |
| 90 RunTest(base::FilePath(FILE_PATH_LITERAL("list_test.html"))); | 103 LoadFile(base::FilePath(FILE_PATH_LITERAL("list_test.html"))); |
| 91 } | 104 } |
| 92 | 105 |
| 93 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, GridTest) { | 106 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, GridTest) { |
| 94 AddLibrary(IDR_WEBUI_JS_CR); | 107 AddLibrary(IDR_WEBUI_JS_CR); |
| 95 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 108 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 96 AddLibrary(IDR_WEBUI_JS_CR_UI); | 109 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 97 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); | 110 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); |
| 98 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST); | 111 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST); |
| 99 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM); | 112 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM); |
| 100 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER); | 113 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER); |
| 101 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); | 114 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); |
| 102 // Grid must be the last addition as it depends on list libraries. | 115 // Grid must be the last addition as it depends on list libraries. |
| 103 AddLibrary(IDR_WEBUI_JS_CR_UI_GRID); | 116 AddLibrary(IDR_WEBUI_JS_CR_UI_GRID); |
| 104 RunTest(base::FilePath(FILE_PATH_LITERAL("grid_test.html"))); | 117 LoadFile(base::FilePath(FILE_PATH_LITERAL("grid_test.html"))); |
| 105 } | 118 } |
| 106 | 119 |
| 107 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LinkControllerTest) { | 120 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LinkControllerTest) { |
| 108 AddLibrary(IDR_WEBUI_JS_CR); | 121 AddLibrary(IDR_WEBUI_JS_CR); |
| 109 AddLibrary(IDR_WEBUI_JS_CR_LINK_CONTROLLER); | 122 AddLibrary(IDR_WEBUI_JS_CR_LINK_CONTROLLER); |
| 110 RunTest(base::FilePath(FILE_PATH_LITERAL("link_controller_test.html"))); | 123 LoadFile(base::FilePath(FILE_PATH_LITERAL("link_controller_test.html"))); |
| 111 } | 124 } |
| 112 | 125 |
| 113 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListSelectionModelTest) { | 126 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListSelectionModelTest) { |
| 114 AddLibrary(IDR_WEBUI_JS_CR); | 127 AddLibrary(IDR_WEBUI_JS_CR); |
| 115 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 128 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 116 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); | 129 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); |
| 117 RunTest(base::FilePath(FILE_PATH_LITERAL("list_selection_model_test.html"))); | 130 LoadFile(base::FilePath(FILE_PATH_LITERAL("list_selection_model_test.html"))); |
| 118 } | 131 } |
| 119 | 132 |
| 120 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListSingleSelectionModelTest) { | 133 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListSingleSelectionModelTest) { |
| 121 AddLibrary(IDR_WEBUI_JS_CR); | 134 AddLibrary(IDR_WEBUI_JS_CR); |
| 122 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 135 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 123 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SINGLE_SELECTION_MODEL); | 136 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SINGLE_SELECTION_MODEL); |
| 124 RunTest(base::FilePath(FILE_PATH_LITERAL( | 137 LoadFile(base::FilePath(FILE_PATH_LITERAL( |
| 125 "list_single_selection_model_test.html"))); | 138 "list_single_selection_model_test.html"))); |
| 126 } | 139 } |
| 127 | 140 |
| 128 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, InlineEditableListTest) { | 141 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, InlineEditableListTest) { |
| 129 AddLibrary(IDR_WEBUI_JS_CR); | 142 AddLibrary(IDR_WEBUI_JS_CR); |
| 130 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 143 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 131 AddLibrary(IDR_WEBUI_JS_CR_UI); | 144 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 132 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); | 145 AddLibrary(IDR_WEBUI_JS_CR_UI_ARRAY_DATA_MODEL); |
| 133 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM); | 146 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_ITEM); |
| 134 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER); | 147 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_CONTROLLER); |
| 135 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); | 148 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL); |
| 136 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST); | 149 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST); |
| 137 AddLibrary(IDR_WEBUI_JS_LOAD_TIME_DATA); | 150 AddLibrary(IDR_WEBUI_JS_LOAD_TIME_DATA); |
| 138 AddLibrary(IDR_OPTIONS_DELETABLE_ITEM_LIST); | 151 AddLibrary(IDR_OPTIONS_DELETABLE_ITEM_LIST); |
| 139 AddLibrary(IDR_OPTIONS_INLINE_EDITABLE_LIST); | 152 AddLibrary(IDR_OPTIONS_INLINE_EDITABLE_LIST); |
| 140 RunTest(base::FilePath(FILE_PATH_LITERAL( | 153 LoadFile(base::FilePath(FILE_PATH_LITERAL( |
| 141 "inline_editable_list_test.html"))); | 154 "inline_editable_list_test.html"))); |
| 142 } | 155 } |
| 143 | 156 |
| 144 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MenuTest) { | 157 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MenuTest) { |
| 145 AddLibrary(IDR_WEBUI_JS_ASSERT); | 158 AddLibrary(IDR_WEBUI_JS_ASSERT); |
| 146 AddLibrary(IDR_WEBUI_JS_CR); | 159 AddLibrary(IDR_WEBUI_JS_CR); |
| 147 AddLibrary(IDR_WEBUI_JS_CR_UI); | 160 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 148 AddLibrary(IDR_WEBUI_JS_CR_UI_COMMAND); | 161 AddLibrary(IDR_WEBUI_JS_CR_UI_COMMAND); |
| 149 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_ITEM); | 162 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_ITEM); |
| 150 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU); | 163 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU); |
| 151 RunTest(base::FilePath(FILE_PATH_LITERAL("menu_test.html"))); | 164 LoadFile(base::FilePath(FILE_PATH_LITERAL("menu_test.html"))); |
| 152 } | 165 } |
| 153 | 166 |
| 154 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MockTimerTest) { | 167 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MockTimerTest) { |
| 155 RunTest(base::FilePath(FILE_PATH_LITERAL("mock_timer_test.html"))); | 168 LoadFile(base::FilePath(FILE_PATH_LITERAL("mock_timer_test.html"))); |
| 156 } | 169 } |
| 157 | 170 |
| 158 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ParseHtmlSubsetTest) { | 171 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ParseHtmlSubsetTest) { |
| 159 AddLibrary(IDR_WEBUI_JS_PARSE_HTML_SUBSET); | 172 AddLibrary(IDR_WEBUI_JS_PARSE_HTML_SUBSET); |
| 160 RunTest(base::FilePath(FILE_PATH_LITERAL("parse_html_subset_test.html"))); | 173 LoadFile(base::FilePath(FILE_PATH_LITERAL("parse_html_subset_test.html"))); |
| 161 } | 174 } |
| 162 | 175 |
| 163 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PositionUtilTest) { | 176 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PositionUtilTest) { |
| 164 AddLibrary(IDR_WEBUI_JS_CR); | 177 AddLibrary(IDR_WEBUI_JS_CR); |
| 165 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); | 178 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); |
| 166 RunTest(base::FilePath(FILE_PATH_LITERAL("position_util_test.html"))); | 179 LoadFile(base::FilePath(FILE_PATH_LITERAL("position_util_test.html"))); |
| 167 } | 180 } |
| 168 | 181 |
| 169 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, RepeatingButtonTest) { | 182 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, RepeatingButtonTest) { |
| 170 AddLibrary(IDR_WEBUI_JS_CR); | 183 AddLibrary(IDR_WEBUI_JS_CR); |
| 171 AddLibrary(IDR_WEBUI_JS_CR_UI); | 184 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 172 AddLibrary(IDR_WEBUI_JS_CR_UI_REPEATING_BUTTON); | 185 AddLibrary(IDR_WEBUI_JS_CR_UI_REPEATING_BUTTON); |
| 173 RunTest(base::FilePath(FILE_PATH_LITERAL("repeating_button_test.html"))); | 186 LoadFile(base::FilePath(FILE_PATH_LITERAL("repeating_button_test.html"))); |
| 174 } | 187 } |
| 175 | 188 |
| 176 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, CommandTest) { | 189 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, CommandTest) { |
| 177 AddLibrary(IDR_WEBUI_JS_ASSERT); | 190 AddLibrary(IDR_WEBUI_JS_ASSERT); |
| 178 AddLibrary(IDR_WEBUI_JS_CR); | 191 AddLibrary(IDR_WEBUI_JS_CR); |
| 179 AddLibrary(IDR_WEBUI_JS_CR_UI); | 192 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 180 AddLibrary(IDR_WEBUI_JS_CR_UI_COMMAND); | 193 AddLibrary(IDR_WEBUI_JS_CR_UI_COMMAND); |
| 181 RunTest(base::FilePath(FILE_PATH_LITERAL("command_test.html"))); | 194 LoadFile(base::FilePath(FILE_PATH_LITERAL("command_test.html"))); |
| 182 } | 195 } |
| 183 | 196 |
| 184 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ContextMenuHandlerTest) { | 197 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ContextMenuHandlerTest) { |
| 185 AddLibrary(IDR_WEBUI_JS_ASSERT); | 198 AddLibrary(IDR_WEBUI_JS_ASSERT); |
| 186 AddLibrary(IDR_WEBUI_JS_EVENT_TRACKER); | 199 AddLibrary(IDR_WEBUI_JS_EVENT_TRACKER); |
| 187 AddLibrary(IDR_WEBUI_JS_CR); | 200 AddLibrary(IDR_WEBUI_JS_CR); |
| 188 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); | 201 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); |
| 189 AddLibrary(IDR_WEBUI_JS_CR_UI); | 202 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 190 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); | 203 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); |
| 191 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_ITEM); | 204 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_ITEM); |
| 192 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_BUTTON); | 205 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_BUTTON); |
| 193 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU); | 206 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU); |
| 194 AddLibrary(IDR_WEBUI_JS_CR_UI_CONTEXT_MENU_HANDLER); | 207 AddLibrary(IDR_WEBUI_JS_CR_UI_CONTEXT_MENU_HANDLER); |
| 195 RunTest(base::FilePath(FILE_PATH_LITERAL("context_menu_handler_test.html"))); | 208 LoadFile(base::FilePath(FILE_PATH_LITERAL("context_menu_handler_test.html"))); |
| 196 } | 209 } |
| 197 | 210 |
| 198 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MenuButtonTest) { | 211 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, MenuButtonTest) { |
| 199 AddLibrary(IDR_WEBUI_JS_ASSERT); | 212 AddLibrary(IDR_WEBUI_JS_ASSERT); |
| 200 AddLibrary(IDR_WEBUI_JS_EVENT_TRACKER); | 213 AddLibrary(IDR_WEBUI_JS_EVENT_TRACKER); |
| 201 AddLibrary(IDR_WEBUI_JS_CR); | 214 AddLibrary(IDR_WEBUI_JS_CR); |
| 202 AddLibrary(IDR_WEBUI_JS_CR_UI); | 215 AddLibrary(IDR_WEBUI_JS_CR_UI); |
| 203 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); | 216 AddLibrary(IDR_WEBUI_JS_CR_UI_POSITION_UTIL); |
| 204 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_BUTTON); | 217 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU_BUTTON); |
| 205 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU); | 218 AddLibrary(IDR_WEBUI_JS_CR_UI_MENU); |
| 206 RunTest(base::FilePath(FILE_PATH_LITERAL("menu_button_test.html"))); | 219 LoadFile(base::FilePath(FILE_PATH_LITERAL("menu_button_test.html"))); |
| 207 } | 220 } |
| OLD | NEW |