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

Side by Side Diff: chrome/test/base/chrome_test_suite.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
« no previous file with comments | « chrome/test/base/chrome_test_launcher.cc ('k') | chrome/test/base/chrome_unit_test_suite.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CHROME_TEST_SUITE_H_ 5 #ifndef CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
6 #define CHROME_TEST_BASE_CHROME_TEST_SUITE_H_ 6 #define CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "content/public/test/content_test_suite_base.h" 12 #include "content/public/test/content_test_suite_base.h"
13 13
14 // Test suite for unit and browser tests. Creates services needed by both. 14 // Test suite for unit and browser tests. Creates services needed by both.
15 // See also ChromeUnitTestSuite for additional services created for unit tests. 15 // See also ChromeUnitTestSuite for additional services created for unit tests.
16 class ChromeTestSuite : public content::ContentTestSuiteBase { 16 class ChromeTestSuite : public content::ContentTestSuiteBase {
17 public: 17 public:
18 ChromeTestSuite(int argc, char** argv); 18 ChromeTestSuite(int argc, char** argv);
19 virtual ~ChromeTestSuite(); 19 virtual ~ChromeTestSuite();
20 20
21 protected: 21 protected:
22 // base::TestSuite overrides: 22 // base::TestSuite overrides:
23 virtual void Initialize() OVERRIDE; 23 virtual void Initialize() override;
24 virtual void Shutdown() OVERRIDE; 24 virtual void Shutdown() override;
25 25
26 void SetBrowserDirectory(const base::FilePath& browser_dir) { 26 void SetBrowserDirectory(const base::FilePath& browser_dir) {
27 browser_dir_ = browser_dir; 27 browser_dir_ = browser_dir;
28 } 28 }
29 29
30 // Alternative path to browser binaries. 30 // Alternative path to browser binaries.
31 base::FilePath browser_dir_; 31 base::FilePath browser_dir_;
32 32
33 33
34 DISALLOW_COPY_AND_ASSIGN(ChromeTestSuite); 34 DISALLOW_COPY_AND_ASSIGN(ChromeTestSuite);
35 }; 35 };
36 36
37 #endif // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_ 37 #endif // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_
OLDNEW
« no previous file with comments | « chrome/test/base/chrome_test_launcher.cc ('k') | chrome/test/base/chrome_unit_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698