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

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

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix InstantNTP test. Created 7 years, 5 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 | Annotate | Revision Log
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 views_delegate_.reset(new AshTestViewsDelegate); 21 views_delegate_.reset(new AshTestViewsDelegate());
22 webview_test_helper_.reset(new views::WebViewTestHelper(message_loop())); 22 webview_test_helper_.reset(new views::WebViewTestHelper());
23 } 23 }
24 24
25 virtual ~ScreensaverViewTest() {} 25 virtual ~ScreensaverViewTest() {}
26 26
27 virtual void SetUp() OVERRIDE { 27 virtual void SetUp() OVERRIDE {
28 AshTestBase::SetUp(); 28 AshTestBase::SetUp();
29 RunAllPendingInMessageLoop(); 29 RunAllPendingInMessageLoop();
30 } 30 }
31 31
32 void ExpectOpenScreensaver() { 32 void ExpectOpenScreensaver() {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 RunAllPendingInMessageLoop(); 72 RunAllPendingInMessageLoop();
73 73
74 ash::CloseScreensaver(); 74 ash::CloseScreensaver();
75 ExpectClosedScreensaver(); 75 ExpectClosedScreensaver();
76 ash::CloseScreensaver(); 76 ash::CloseScreensaver();
77 ExpectClosedScreensaver(); 77 ExpectClosedScreensaver();
78 } 78 }
79 79
80 } // namespace test 80 } // namespace test
81 } // namespace ash 81 } // namespace ash
OLDNEW
« no previous file with comments | « ash/desktop_background/desktop_background_controller_unittest.cc ('k') | ash/test/ash_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698