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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « ash/screensaver/screensaver_view.cc ('k') | ash/shelf/alternate_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"
(...skipping 12 matching lines...) Expand all
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() {
33 internal::ScreensaverView* screensaver = 33 ScreensaverView* screensaver = ScreensaverView::GetInstance();
34 internal::ScreensaverView::GetInstance();
35 EXPECT_TRUE(screensaver != NULL); 34 EXPECT_TRUE(screensaver != NULL);
36 if (!screensaver) return; 35 if (!screensaver) return;
37 EXPECT_TRUE(screensaver->IsScreensaverShowingURL(url_)); 36 EXPECT_TRUE(screensaver->IsScreensaverShowingURL(url_));
38 } 37 }
39 38
40 void ExpectClosedScreensaver() { 39 void ExpectClosedScreensaver() {
41 EXPECT_TRUE(internal::ScreensaverView::GetInstance() == NULL); 40 EXPECT_TRUE(ScreensaverView::GetInstance() == NULL);
42 } 41 }
43 42
44 protected: 43 protected:
45 GURL url_; 44 GURL url_;
46 45
47 private: 46 private:
48 scoped_ptr<AshTestViewsDelegate> views_delegate_; 47 scoped_ptr<AshTestViewsDelegate> views_delegate_;
49 scoped_ptr<views::WebViewTestHelper> webview_test_helper_; 48 scoped_ptr<views::WebViewTestHelper> webview_test_helper_;
50 49
51 DISALLOW_COPY_AND_ASSIGN(ScreensaverViewTest); 50 DISALLOW_COPY_AND_ASSIGN(ScreensaverViewTest);
(...skipping 20 matching lines...) Expand all
72 RunAllPendingInMessageLoop(); 71 RunAllPendingInMessageLoop();
73 72
74 ash::CloseScreensaver(); 73 ash::CloseScreensaver();
75 ExpectClosedScreensaver(); 74 ExpectClosedScreensaver();
76 ash::CloseScreensaver(); 75 ash::CloseScreensaver();
77 ExpectClosedScreensaver(); 76 ExpectClosedScreensaver();
78 } 77 }
79 78
80 } // namespace test 79 } // namespace test
81 } // namespace ash 80 } // namespace ash
OLDNEW
« no previous file with comments | « ash/screensaver/screensaver_view.cc ('k') | ash/shelf/alternate_app_list_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698