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

Side by Side Diff: athena/test/chrome/athena_browsertest.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « athena/test/base/test_resource_manager_delegate.cc ('k') | athena/util/drag_handle.cc » ('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) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 ATHENA_TEST_CHROME_ATHENA_BROWSERTEST_H_ 5 #ifndef ATHENA_TEST_CHROME_ATHENA_BROWSERTEST_H_
6 #define ATHENA_TEST_CHROME_ATHENA_BROWSERTEST_H_ 6 #define ATHENA_TEST_CHROME_ATHENA_BROWSERTEST_H_
7 7
8 #include "athena/resource_manager/public/resource_manager.h" 8 #include "athena/resource_manager/public/resource_manager.h"
9 #include "chrome/test/base/in_process_browser_test.h" 9 #include "chrome/test/base/in_process_browser_test.h"
10 10
11 class GURL; 11 class GURL;
12 12
13 namespace athena { 13 namespace athena {
14 class Activity; 14 class Activity;
15 15
16 // Base class for athena tests. 16 // Base class for athena tests.
17 // 17 //
18 // Note: To avoid asynchronous resource manager events, the memory pressure 18 // Note: To avoid asynchronous resource manager events, the memory pressure
19 // callback gets turned off at the beginning to a low memory pressure. 19 // callback gets turned off at the beginning to a low memory pressure.
20 class AthenaBrowserTest : public InProcessBrowserTest { 20 class AthenaBrowserTest : public InProcessBrowserTest {
21 public: 21 public:
22 AthenaBrowserTest(); 22 AthenaBrowserTest();
23 virtual ~AthenaBrowserTest(); 23 virtual ~AthenaBrowserTest();
24 24
25 // Configures everything for an in process browser test, then invokes 25 // Configures everything for an in process browser test, then invokes
26 // BrowserMain. BrowserMain ends up invoking RunTestOnMainThreadLoop. 26 // BrowserMain. BrowserMain ends up invoking RunTestOnMainThreadLoop.
27 virtual void SetUp() OVERRIDE; 27 virtual void SetUp() override;
28 28
29 protected: 29 protected:
30 // Sends a memory pressure event to the resource manager with a new |pressure| 30 // Sends a memory pressure event to the resource manager with a new |pressure|
31 // level. turning off asynchronous pressure changed events. 31 // level. turning off asynchronous pressure changed events.
32 void SendMemoryPressureEvent(ResourceManager::MemoryPressure pressure); 32 void SendMemoryPressureEvent(ResourceManager::MemoryPressure pressure);
33 33
34 // Create a new web activity and return after the page is fully loaded. 34 // Create a new web activity and return after the page is fully loaded.
35 Activity* CreateWebActivity(const base::string16& title, 35 Activity* CreateWebActivity(const base::string16& title,
36 const GURL& url); 36 const GURL& url);
37 37
38 // Creates an app activity and returns after app is fully loaded. 38 // Creates an app activity and returns after app is fully loaded.
39 Activity* CreateAppActivity(const base::string16& title, 39 Activity* CreateAppActivity(const base::string16& title,
40 const std::string app_id); 40 const std::string app_id);
41 41
42 // Wait until the system is idle. 42 // Wait until the system is idle.
43 void WaitUntilIdle(); 43 void WaitUntilIdle();
44 44
45 // BrowserTestBase: 45 // BrowserTestBase:
46 virtual void SetUpOnMainThread() OVERRIDE; 46 virtual void SetUpOnMainThread() override;
47 47
48 private: 48 private:
49 DISALLOW_COPY_AND_ASSIGN(AthenaBrowserTest); 49 DISALLOW_COPY_AND_ASSIGN(AthenaBrowserTest);
50 }; 50 };
51 51
52 } // namespace athena 52 } // namespace athena
53 53
54 #endif // ATHENA_TEST_CHROME_ATHENA_BROWSERTEST_H_ 54 #endif // ATHENA_TEST_CHROME_ATHENA_BROWSERTEST_H_
55 55
OLDNEW
« no previous file with comments | « athena/test/base/test_resource_manager_delegate.cc ('k') | athena/util/drag_handle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698