| OLD | NEW | 
|    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  | 
|   11 #include "base/message_loop/message_loop.h" |   11 #include "base/message_loop/message_loop.h" | 
|   12 #include "base/prefs/testing_pref_service.h" |   12 #include "base/prefs/testing_pref_service.h" | 
|   13 #include "chrome/browser/notifications/balloon_collection_impl.h" |   13 #include "chrome/browser/notifications/balloon_collection_impl.h" | 
|   14 #include "chrome/browser/notifications/balloon_notification_ui_manager.h" |   14 #include "chrome/browser/notifications/balloon_notification_ui_manager.h" | 
|   15 #include "chrome/browser/notifications/desktop_notification_service.h" |   15 #include "chrome/browser/notifications/desktop_notification_service.h" | 
|   16 #include "chrome/browser/notifications/notification.h" |   16 #include "chrome/browser/notifications/notification.h" | 
|   17 #include "chrome/browser/notifications/notification_test_util.h" |   17 #include "chrome/browser/notifications/notification_test_util.h" | 
|   18 #include "chrome/test/base/testing_browser_process.h" |   18 #include "chrome/test/base/testing_browser_process.h" | 
|   19 #include "chrome/test/base/testing_profile.h" |   19 #include "chrome/test/base/testing_profile.h" | 
|   20 #include "content/public/test/render_view_test.h" |   20 #include "content/public/test/render_view_test.h" | 
|   21 #include "content/public/test/test_browser_thread.h" |   21 #include "content/public/test/test_browser_thread.h" | 
|   22 #include "testing/gtest/include/gtest/gtest.h" |   22 #include "testing/gtest/include/gtest/gtest.h" | 
|   23  |   23  | 
|   24 #if defined(USE_AURA) |   24 #if defined(USE_AURA) | 
|   25 namespace views { |   25 namespace wm { | 
|   26 namespace corewm { |  | 
|   27 class WMState; |   26 class WMState; | 
|   28 } |   27 } | 
|   29 } |  | 
|   30 #endif |   28 #endif | 
|   31  |   29  | 
|   32 class ActiveDesktopMonitor; |   30 class ActiveDesktopMonitor; | 
|   33 class DesktopNotificationsTest; |   31 class DesktopNotificationsTest; | 
|   34 typedef LoggingNotificationDelegate<DesktopNotificationsTest> |   32 typedef LoggingNotificationDelegate<DesktopNotificationsTest> | 
|   35     LoggingNotificationProxy; |   33     LoggingNotificationProxy; | 
|   36  |   34  | 
|   37 // Test version of the balloon collection which counts the number |   35 // Test version of the balloon collection which counts the number | 
|   38 // of notifications that are added to it. |   36 // of notifications that are added to it. | 
|   39 class MockBalloonCollection : public BalloonCollectionImpl { |   37 class MockBalloonCollection : public BalloonCollectionImpl { | 
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  125   scoped_ptr<BalloonNotificationUIManager> ui_manager_; |  123   scoped_ptr<BalloonNotificationUIManager> ui_manager_; | 
|  126  |  124  | 
|  127   // Real DesktopNotificationService |  125   // Real DesktopNotificationService | 
|  128   scoped_ptr<DesktopNotificationService> service_; |  126   scoped_ptr<DesktopNotificationService> service_; | 
|  129  |  127  | 
|  130   // Contains the cumulative output of the unit test. |  128   // Contains the cumulative output of the unit test. | 
|  131   static std::string log_output_; |  129   static std::string log_output_; | 
|  132  |  130  | 
|  133  private: |  131  private: | 
|  134 #if defined(USE_AURA) |  132 #if defined(USE_AURA) | 
|  135   scoped_ptr<views::corewm::WMState> wm_state_; |  133   scoped_ptr<wm::WMState> wm_state_; | 
|  136 #endif |  134 #endif | 
|  137  |  135  | 
|  138   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationsTest); |  136   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationsTest); | 
|  139 }; |  137 }; | 
|  140  |  138  | 
|  141 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ |  139 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_ | 
| OLD | NEW |