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

Side by Side Diff: ash/screensaver/screensaver_view_unittest.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 | « ash/screensaver/screensaver_view.h ('k') | ash/shelf/app_list_button.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 #include "ash/screensaver/screensaver_view.h" 5 #include "ash/screensaver/screensaver_view.h"
6 6
7 #include "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "content/public/browser/browser_context.h" 9 #include "content/public/browser/browser_context.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
11 #include "ui/views/controls/webview/webview.h" 11 #include "ui/views/controls/webview/webview.h"
12 #include "ui/views/test/webview_test_helper.h" 12 #include "ui/views/test/webview_test_helper.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace test { 15 namespace test {
16 16
17 class ScreensaverViewTest : public ash::test::AshTestBase { 17 class ScreensaverViewTest : public ash::test::AshTestBase {
18 public: 18 public:
19 ScreensaverViewTest() { 19 ScreensaverViewTest() {
20 url_ = GURL("http://www.google.com"); 20 url_ = GURL("http://www.google.com");
21 webview_test_helper_.reset(new views::WebViewTestHelper()); 21 webview_test_helper_.reset(new views::WebViewTestHelper());
22 } 22 }
23 23
24 virtual ~ScreensaverViewTest() {} 24 virtual ~ScreensaverViewTest() {}
25 25
26 virtual void SetUp() OVERRIDE { 26 virtual void SetUp() override {
27 AshTestBase::SetUp(); 27 AshTestBase::SetUp();
28 RunAllPendingInMessageLoop(); 28 RunAllPendingInMessageLoop();
29 } 29 }
30 30
31 void ExpectOpenScreensaver() { 31 void ExpectOpenScreensaver() {
32 ScreensaverView* screensaver = ScreensaverView::GetInstance(); 32 ScreensaverView* screensaver = ScreensaverView::GetInstance();
33 EXPECT_TRUE(screensaver != NULL); 33 EXPECT_TRUE(screensaver != NULL);
34 if (!screensaver) return; 34 if (!screensaver) return;
35 EXPECT_TRUE(screensaver->IsScreensaverShowingURL(url_)); 35 EXPECT_TRUE(screensaver->IsScreensaverShowingURL(url_));
36 } 36 }
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 RunAllPendingInMessageLoop(); 69 RunAllPendingInMessageLoop();
70 70
71 ash::CloseScreensaver(); 71 ash::CloseScreensaver();
72 ExpectClosedScreensaver(); 72 ExpectClosedScreensaver();
73 ash::CloseScreensaver(); 73 ash::CloseScreensaver();
74 ExpectClosedScreensaver(); 74 ExpectClosedScreensaver();
75 } 75 }
76 76
77 } // namespace test 77 } // namespace test
78 } // namespace ash 78 } // namespace ash
OLDNEW
« no previous file with comments | « ash/screensaver/screensaver_view.h ('k') | ash/shelf/app_list_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698