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 #include "extensions/browser/api/idle/idle_api.h" | 5 #include "extensions/browser/api/idle/idle_api.h" |
6 | 6 |
7 #include <limits.h> | 7 #include <limits.h> |
8 #include <string> | 8 #include <string> |
9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" |
10 #include "base/strings/string_number_conversions.h" | 11 #include "base/strings/string_number_conversions.h" |
11 #include "extensions/browser/api/idle/idle_api_constants.h" | 12 #include "extensions/browser/api/idle/idle_api_constants.h" |
12 #include "extensions/browser/api/idle/idle_manager_factory.h" | 13 #include "extensions/browser/api/idle/idle_manager_factory.h" |
13 #include "extensions/browser/api/idle/idle_manager.h" | 14 #include "extensions/browser/api/idle/idle_manager.h" |
14 #include "extensions/browser/api_unittest.h" | 15 #include "extensions/browser/api_unittest.h" |
15 #include "extensions/browser/event_router.h" | 16 #include "extensions/browser/event_router.h" |
16 #include "extensions/browser/extension_registry.h" | 17 #include "extensions/browser/extension_registry.h" |
17 #include "extensions/common/api/idle.h" | 18 #include "extensions/common/api/idle.h" |
18 #include "extensions/common/extension.h" | 19 #include "extensions/common/extension.h" |
19 #include "testing/gmock/include/gmock/gmock.h" | 20 #include "testing/gmock/include/gmock/gmock.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 extension_id_, GURL(), NULL); | 105 extension_id_, GURL(), NULL); |
105 idle_manager_->OnListenerAdded(details); | 106 idle_manager_->OnListenerAdded(details); |
106 } | 107 } |
107 | 108 |
108 ScopedListen::~ScopedListen() { | 109 ScopedListen::~ScopedListen() { |
109 const EventListenerInfo details(idle::OnStateChanged::kEventName, | 110 const EventListenerInfo details(idle::OnStateChanged::kEventName, |
110 extension_id_, GURL(), NULL); | 111 extension_id_, GURL(), NULL); |
111 idle_manager_->OnListenerRemoved(details); | 112 idle_manager_->OnListenerRemoved(details); |
112 } | 113 } |
113 | 114 |
114 KeyedService* IdleManagerTestFactory(content::BrowserContext* context) { | 115 scoped_ptr<KeyedService> IdleManagerTestFactory( |
115 return new IdleManager(context); | 116 content::BrowserContext* context) { |
| 117 return make_scoped_ptr(new IdleManager(context)); |
116 } | 118 } |
117 | 119 |
118 } // namespace | 120 } // namespace |
119 | 121 |
120 class IdleTest : public ApiUnitTest { | 122 class IdleTest : public ApiUnitTest { |
121 public: | 123 public: |
122 void SetUp() override; | 124 void SetUp() override; |
123 | 125 |
124 protected: | 126 protected: |
125 IdleManager* idle_manager_; | 127 IdleManager* idle_manager_; |
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 | 547 |
546 { | 548 { |
547 // Nothing should have fired, the listener wasn't added until afterward. | 549 // Nothing should have fired, the listener wasn't added until afterward. |
548 ScopedListen listen(idle_manager_, "test"); | 550 ScopedListen listen(idle_manager_, "test"); |
549 idle_manager_->UpdateIdleState(); | 551 idle_manager_->UpdateIdleState(); |
550 testing::Mock::VerifyAndClearExpectations(event_delegate_); | 552 testing::Mock::VerifyAndClearExpectations(event_delegate_); |
551 } | 553 } |
552 } | 554 } |
553 | 555 |
554 } // namespace extensions | 556 } // namespace extensions |
OLD | NEW |