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

Side by Side Diff: content/browser/webui/web_ui_mojo_browsertest.cc

Issue 678073006: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 #include <limits> 5 #include <limits>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 172
173 DISALLOW_COPY_AND_ASSIGN(TestWebUIControllerFactory); 173 DISALLOW_COPY_AND_ASSIGN(TestWebUIControllerFactory);
174 }; 174 };
175 175
176 class WebUIMojoTest : public ContentBrowserTest { 176 class WebUIMojoTest : public ContentBrowserTest {
177 public: 177 public:
178 WebUIMojoTest() { 178 WebUIMojoTest() {
179 WebUIControllerFactory::RegisterFactory(&factory_); 179 WebUIControllerFactory::RegisterFactory(&factory_);
180 } 180 }
181 181
182 virtual ~WebUIMojoTest() { 182 ~WebUIMojoTest() override {
183 WebUIControllerFactory::UnregisterFactoryForTesting(&factory_); 183 WebUIControllerFactory::UnregisterFactoryForTesting(&factory_);
184 } 184 }
185 185
186 TestWebUIControllerFactory* factory() { return &factory_; } 186 TestWebUIControllerFactory* factory() { return &factory_; }
187 187
188 private: 188 private:
189 TestWebUIControllerFactory factory_; 189 TestWebUIControllerFactory factory_;
190 190
191 DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest); 191 DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest);
192 }; 192 };
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 NavigateToURL(other_shell, test_url); 231 NavigateToURL(other_shell, test_url);
232 // RunLoop is quit when message received from page. 232 // RunLoop is quit when message received from page.
233 other_run_loop.Run(); 233 other_run_loop.Run();
234 EXPECT_TRUE(got_message); 234 EXPECT_TRUE(got_message);
235 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(), 235 EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(),
236 other_shell->web_contents()->GetRenderProcessHost()); 236 other_shell->web_contents()->GetRenderProcessHost());
237 } 237 }
238 238
239 } // namespace 239 } // namespace
240 } // namespace content 240 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698