OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/guest_view/browser/test_guest_view_manager.h" | 5 #include "components/guest_view/browser/test_guest_view_manager.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
| 9 #include "base/memory/ptr_util.h" |
9 #include "components/guest_view/browser/guest_view_manager_delegate.h" | 10 #include "components/guest_view/browser/guest_view_manager_delegate.h" |
10 | 11 |
11 namespace guest_view { | 12 namespace guest_view { |
12 | 13 |
13 TestGuestViewManager::TestGuestViewManager( | 14 TestGuestViewManager::TestGuestViewManager( |
14 content::BrowserContext* context, | 15 content::BrowserContext* context, |
15 std::unique_ptr<GuestViewManagerDelegate> delegate) | 16 std::unique_ptr<GuestViewManagerDelegate> delegate) |
16 : GuestViewManager(context, std::move(delegate)), | 17 : GuestViewManager(context, std::move(delegate)), |
17 num_embedder_processes_destroyed_(0), | 18 num_embedder_processes_destroyed_(0), |
18 num_guests_created_(0), | 19 num_guests_created_(0), |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
89 void TestGuestViewManager::WaitForSingleViewGarbageCollected() { | 90 void TestGuestViewManager::WaitForSingleViewGarbageCollected() { |
90 if (!num_views_garbage_collected()) | 91 if (!num_views_garbage_collected()) |
91 WaitForViewGarbageCollected(); | 92 WaitForViewGarbageCollected(); |
92 } | 93 } |
93 | 94 |
94 void TestGuestViewManager::AddGuest(int guest_instance_id, | 95 void TestGuestViewManager::AddGuest(int guest_instance_id, |
95 content::WebContents* guest_web_contents) { | 96 content::WebContents* guest_web_contents) { |
96 GuestViewManager::AddGuest(guest_instance_id, guest_web_contents); | 97 GuestViewManager::AddGuest(guest_instance_id, guest_web_contents); |
97 | 98 |
98 guest_web_contents_watchers_.push_back( | 99 guest_web_contents_watchers_.push_back( |
99 linked_ptr<content::WebContentsDestroyedWatcher>( | 100 base::MakeUnique<content::WebContentsDestroyedWatcher>( |
100 new content::WebContentsDestroyedWatcher(guest_web_contents))); | 101 guest_web_contents)); |
101 | 102 |
102 if (created_message_loop_runner_.get()) | 103 if (created_message_loop_runner_.get()) |
103 created_message_loop_runner_->Quit(); | 104 created_message_loop_runner_->Quit(); |
104 | 105 |
105 ++num_guests_created_; | 106 ++num_guests_created_; |
106 if (!waiting_for_guests_created_ && | 107 if (!waiting_for_guests_created_ && |
107 num_guests_created_ != expected_num_guests_created_) { | 108 num_guests_created_ != expected_num_guests_created_) { |
108 return; | 109 return; |
109 } | 110 } |
110 | 111 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
147 content::BrowserContext* context, | 148 content::BrowserContext* context, |
148 std::unique_ptr<GuestViewManagerDelegate> delegate) { | 149 std::unique_ptr<GuestViewManagerDelegate> delegate) { |
149 if (!test_guest_view_manager_) { | 150 if (!test_guest_view_manager_) { |
150 test_guest_view_manager_ = | 151 test_guest_view_manager_ = |
151 new TestGuestViewManager(context, std::move(delegate)); | 152 new TestGuestViewManager(context, std::move(delegate)); |
152 } | 153 } |
153 return test_guest_view_manager_; | 154 return test_guest_view_manager_; |
154 } | 155 } |
155 | 156 |
156 } // namespace guest_view | 157 } // namespace guest_view |
OLD | NEW |