| 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 "content/browser/frame_host/render_widget_host_view_guest.h" | 5 #include "content/browser/frame_host/render_widget_host_view_guest.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 | 68 |
| 69 void TearDown() override { | 69 void TearDown() override { |
| 70 if (view_) | 70 if (view_) |
| 71 view_->Destroy(); | 71 view_->Destroy(); |
| 72 delete widget_host_; | 72 delete widget_host_; |
| 73 | 73 |
| 74 browser_context_.reset(); | 74 browser_context_.reset(); |
| 75 | 75 |
| 76 message_loop_.task_runner()->DeleteSoon(FROM_HERE, | 76 message_loop_.task_runner()->DeleteSoon(FROM_HERE, |
| 77 browser_context_.release()); | 77 browser_context_.release()); |
| 78 message_loop_.RunUntilIdle(); | 78 base::RunLoop().RunUntilIdle(); |
| 79 #if !defined(OS_ANDROID) | 79 #if !defined(OS_ANDROID) |
| 80 ImageTransportFactory::Terminate(); | 80 ImageTransportFactory::Terminate(); |
| 81 #endif | 81 #endif |
| 82 } | 82 } |
| 83 | 83 |
| 84 protected: | 84 protected: |
| 85 base::MessageLoopForUI message_loop_; | 85 base::MessageLoopForUI message_loop_; |
| 86 std::unique_ptr<BrowserContext> browser_context_; | 86 std::unique_ptr<BrowserContext> browser_context_; |
| 87 MockRenderWidgetHostDelegate delegate_; | 87 MockRenderWidgetHostDelegate delegate_; |
| 88 | 88 |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 284 | 284 |
| 285 browser_plugin_guest_->set_attached(false); | 285 browser_plugin_guest_->set_attached(false); |
| 286 browser_plugin_guest_->ResetTestData(); | 286 browser_plugin_guest_->ResetTestData(); |
| 287 | 287 |
| 288 view_->OnSwapCompositorFrame( | 288 view_->OnSwapCompositorFrame( |
| 289 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); | 289 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); |
| 290 EXPECT_TRUE(surface_id().is_null()); | 290 EXPECT_TRUE(surface_id().is_null()); |
| 291 } | 291 } |
| 292 | 292 |
| 293 } // namespace content | 293 } // namespace content |
| OLD | NEW |