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

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

Issue 8771057: aura/cc: Fix DesktopNotificationsTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years 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 | « no previous file | chrome/browser/notifications/desktop_notifications_unittest.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #pragma once 7 #pragma once
8 8
9 #include <deque> 9 #include <deque>
10 #include <string> 10 #include <string>
11 11
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "chrome/browser/notifications/balloon_collection_impl.h" 13 #include "chrome/browser/notifications/balloon_collection_impl.h"
14 #include "chrome/browser/notifications/desktop_notification_service.h" 14 #include "chrome/browser/notifications/desktop_notification_service.h"
15 #include "chrome/browser/notifications/notification.h" 15 #include "chrome/browser/notifications/notification.h"
16 #include "chrome/browser/notifications/notification_test_util.h" 16 #include "chrome/browser/notifications/notification_test_util.h"
17 #include "chrome/browser/notifications/notification_ui_manager.h" 17 #include "chrome/browser/notifications/notification_ui_manager.h"
18 #include "chrome/test/base/testing_pref_service.h" 18 #include "chrome/test/base/testing_pref_service.h"
19 #include "chrome/test/base/testing_profile.h" 19 #include "chrome/test/base/testing_profile.h"
20 #include "content/test/test_browser_thread.h" 20 #include "content/test/test_browser_thread.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 22
23 #if defined(USE_AURA) && defined(USE_WEBKIT_COMPOSITOR)
24 #include "content/test/render_view_test.h"
25 #endif
26
23 class DesktopNotificationsTest; 27 class DesktopNotificationsTest;
24 typedef LoggingNotificationDelegate<DesktopNotificationsTest> 28 typedef LoggingNotificationDelegate<DesktopNotificationsTest>
25 LoggingNotificationProxy; 29 LoggingNotificationProxy;
26 30
27 // Test version of the balloon collection which counts the number 31 // Test version of the balloon collection which counts the number
28 // of notifications that are added to it. 32 // of notifications that are added to it.
29 class MockBalloonCollection : public BalloonCollectionImpl { 33 class MockBalloonCollection : public BalloonCollectionImpl {
30 public: 34 public:
31 MockBalloonCollection(); 35 MockBalloonCollection();
32 virtual ~MockBalloonCollection(); 36 virtual ~MockBalloonCollection();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 110
107 // Mock balloon collection -- owned by the NotificationUIManager 111 // Mock balloon collection -- owned by the NotificationUIManager
108 MockBalloonCollection* balloon_collection_; 112 MockBalloonCollection* balloon_collection_;
109 113
110 // Real UI manager. 114 // Real UI manager.
111 scoped_ptr<NotificationUIManager> ui_manager_; 115 scoped_ptr<NotificationUIManager> ui_manager_;
112 116
113 // Real DesktopNotificationService 117 // Real DesktopNotificationService
114 scoped_ptr<DesktopNotificationService> service_; 118 scoped_ptr<DesktopNotificationService> service_;
115 119
120 #if defined(USE_AURA) && defined(USE_WEBKIT_COMPOSITOR)
121 content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
122 webkit_platform_support_;
123 #endif
124
116 // Contains the cumulative output of the unit test. 125 // Contains the cumulative output of the unit test.
117 static std::string log_output_; 126 static std::string log_output_;
118 }; 127 };
119 128
120 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ 129 #endif // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/notifications/desktop_notifications_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698