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

Side by Side Diff: chrome/browser/notifications/desktop_notifications_unittest.h

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 7 years, 12 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 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ 5 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ 6 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <string> 9 #include <string>
10 10
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 93
94 // Constructs a notification parameter structure for use in tests. 94 // Constructs a notification parameter structure for use in tests.
95 content::ShowDesktopNotificationHostMsgParams StandardTestNotification(); 95 content::ShowDesktopNotificationHostMsgParams StandardTestNotification();
96 96
97 // Create a message loop to allow notifications code to post tasks, 97 // Create a message loop to allow notifications code to post tasks,
98 // and a thread so that notifications code runs on the expected thread. 98 // and a thread so that notifications code runs on the expected thread.
99 MessageLoopForUI message_loop_; 99 MessageLoopForUI message_loop_;
100 content::TestBrowserThread ui_thread_; 100 content::TestBrowserThread ui_thread_;
101 101
102 // Local state mock. 102 // Local state mock.
103 TestingPrefService local_state_; 103 TestingPrefServiceSimple local_state_;
104 104
105 // Test profile. 105 // Test profile.
106 scoped_ptr<TestingProfile> profile_; 106 scoped_ptr<TestingProfile> profile_;
107 107
108 // Mock balloon collection -- owned by the NotificationUIManager 108 // Mock balloon collection -- owned by the NotificationUIManager
109 MockBalloonCollection* balloon_collection_; 109 MockBalloonCollection* balloon_collection_;
110 110
111 // Real UI manager. 111 // Real UI manager.
112 scoped_ptr<BalloonNotificationUIManager> ui_manager_; 112 scoped_ptr<BalloonNotificationUIManager> ui_manager_;
113 113
114 // Real DesktopNotificationService 114 // Real DesktopNotificationService
115 scoped_ptr<DesktopNotificationService> service_; 115 scoped_ptr<DesktopNotificationService> service_;
116 116
117 #if defined(USE_ASH) 117 #if defined(USE_ASH)
118 content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox 118 content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
119 webkit_platform_support_; 119 webkit_platform_support_;
120 120
121 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_; 121 scoped_ptr<ActiveDesktopMonitor> active_desktop_monitor_;
122 #endif 122 #endif
123 123
124 // Contains the cumulative output of the unit test. 124 // Contains the cumulative output of the unit test.
125 static std::string log_output_; 125 static std::string log_output_;
126 }; 126 };
127 127
128 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ 128 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698