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

Side by Side Diff: chrome/test/base/web_ui_browser_test.h

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ 5 #ifndef CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_
6 #define CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ 6 #define CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 // URL to dummy WebUI page for testing framework. 105 // URL to dummy WebUI page for testing framework.
106 static const char kDummyURL[]; 106 static const char kDummyURL[];
107 107
108 WebUIBrowserTest(); 108 WebUIBrowserTest();
109 109
110 // Accessors for preload test fixture and name. 110 // Accessors for preload test fixture and name.
111 void set_preload_test_fixture(const std::string& preload_test_fixture); 111 void set_preload_test_fixture(const std::string& preload_test_fixture);
112 void set_preload_test_name(const std::string& preload_test_name); 112 void set_preload_test_name(const std::string& preload_test_name);
113 113
114 // Set up & tear down console error catching. 114 // Set up & tear down console error catching.
115 virtual void SetUpOnMainThread() OVERRIDE; 115 virtual void SetUpOnMainThread() override;
116 virtual void TearDownOnMainThread() OVERRIDE; 116 virtual void TearDownOnMainThread() override;
117 117
118 // Set a WebUI instance to run tests on. 118 // Set a WebUI instance to run tests on.
119 void SetWebUIInstance(content::WebUI* web_ui); 119 void SetWebUIInstance(content::WebUI* web_ui);
120 120
121 // Returns a mock WebUI object under test (if any). 121 // Returns a mock WebUI object under test (if any).
122 virtual content::WebUIMessageHandler* GetMockMessageHandler(); 122 virtual content::WebUIMessageHandler* GetMockMessageHandler();
123 123
124 // Returns a file:// GURL constructed from |path| inside the test data dir for 124 // Returns a file:// GURL constructed from |path| inside the test data dir for
125 // webui tests. 125 // webui tests.
126 static GURL WebUITestDataPathToURL(const base::FilePath::StringType& path); 126 static GURL WebUITestDataPathToURL(const base::FilePath::StringType& path);
(...skipping 28 matching lines...) Expand all
155 std::string preload_test_name_; 155 std::string preload_test_name_;
156 156
157 // When this is non-NULL, this is The WebUI instance used for testing. 157 // When this is non-NULL, this is The WebUI instance used for testing.
158 // Otherwise the selected tab's web_ui is used. 158 // Otherwise the selected tab's web_ui is used.
159 content::WebUI* override_selected_web_ui_; 159 content::WebUI* override_selected_web_ui_;
160 160
161 scoped_ptr<TestChromeWebUIControllerFactory> test_factory_; 161 scoped_ptr<TestChromeWebUIControllerFactory> test_factory_;
162 }; 162 };
163 163
164 #endif // CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_ 164 #endif // CHROME_TEST_BASE_WEB_UI_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « chrome/test/base/view_event_test_platform_part_mac.mm ('k') | chrome/test/base/web_ui_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698