Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: chrome/test/data/webui/webui_resource_browsertest.cc

Issue 17450012: Fix test failure in list_selection_model_test.html and port to automated browser test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Documentation tweaks. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 // Resource IDs for internal javascript libraries to inject into the test. 66 // Resource IDs for internal javascript libraries to inject into the test.
67 std::vector<int> include_libraries; 67 std::vector<int> include_libraries;
68 }; 68 };
69 69
70 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PropertyTest) { 70 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, PropertyTest) {
71 AddLibrary(IDR_WEBUI_JS_CR); 71 AddLibrary(IDR_WEBUI_JS_CR);
72 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET); 72 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET);
73 RunTest(base::FilePath(FILE_PATH_LITERAL("cr_test.html"))); 73 RunTest(base::FilePath(FILE_PATH_LITERAL("cr_test.html")));
74 } 74 }
75 75
76 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, ListSelectionModelTest) {
77 AddLibrary(IDR_WEBUI_JS_CR);
78 AddLibrary(IDR_WEBUI_JS_CR_EVENT_TARGET);
79 AddLibrary(IDR_WEBUI_JS_CR_UI_LIST_SELECTION_MODEL);
80 RunTest(base::FilePath(FILE_PATH_LITERAL("list_selection_model_test.html")));
81 }
82
76 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) { 83 IN_PROC_BROWSER_TEST_F(WebUIResourceBrowserTest, LocalStringsTest) {
77 AddLibrary(IDR_WEBUI_JS_LOCAL_STRINGS); 84 AddLibrary(IDR_WEBUI_JS_LOCAL_STRINGS);
78 RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html"))); 85 RunTest(base::FilePath(FILE_PATH_LITERAL("local_strings_test.html")));
79 } 86 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698