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

Side by Side Diff: content/browser/frame_host/render_widget_host_view_guest_unittest.cc

Issue 2082343002: Remove calls to deprecated MessageLoop methods in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR Created 4 years, 5 months 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
OLDNEW
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"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/single_thread_task_runner.h"
13 #include "build/build_config.h" 14 #include "build/build_config.h"
14 #include "cc/surfaces/surface.h" 15 #include "cc/surfaces/surface.h"
15 #include "cc/surfaces/surface_factory.h" 16 #include "cc/surfaces/surface_factory.h"
16 #include "cc/surfaces/surface_manager.h" 17 #include "cc/surfaces/surface_manager.h"
17 #include "cc/surfaces/surface_sequence.h" 18 #include "cc/surfaces/surface_sequence.h"
18 #include "content/browser/browser_plugin/browser_plugin_guest.h" 19 #include "content/browser/browser_plugin/browser_plugin_guest.h"
19 #include "content/browser/compositor/test/no_transport_image_transport_factory.h " 20 #include "content/browser/compositor/test/no_transport_image_transport_factory.h "
20 #include "content/browser/gpu/compositor_util.h" 21 #include "content/browser/gpu/compositor_util.h"
21 #include "content/browser/renderer_host/render_widget_host_delegate.h" 22 #include "content/browser/renderer_host/render_widget_host_delegate.h"
22 #include "content/browser/renderer_host/render_widget_host_impl.h" 23 #include "content/browser/renderer_host/render_widget_host_impl.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 (new TestRenderWidgetHostView(widget_host_))->GetWeakPtr()); 66 (new TestRenderWidgetHostView(widget_host_))->GetWeakPtr());
66 } 67 }
67 68
68 void TearDown() override { 69 void TearDown() override {
69 if (view_) 70 if (view_)
70 view_->Destroy(); 71 view_->Destroy();
71 delete widget_host_; 72 delete widget_host_;
72 73
73 browser_context_.reset(); 74 browser_context_.reset();
74 75
75 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); 76 message_loop_.task_runner()->DeleteSoon(FROM_HERE,
77 browser_context_.release());
76 message_loop_.RunUntilIdle(); 78 message_loop_.RunUntilIdle();
77 #if !defined(OS_ANDROID) 79 #if !defined(OS_ANDROID)
78 ImageTransportFactory::Terminate(); 80 ImageTransportFactory::Terminate();
79 #endif 81 #endif
80 } 82 }
81 83
82 protected: 84 protected:
83 base::MessageLoopForUI message_loop_; 85 base::MessageLoopForUI message_loop_;
84 std::unique_ptr<BrowserContext> browser_context_; 86 std::unique_ptr<BrowserContext> browser_context_;
85 MockRenderWidgetHostDelegate delegate_; 87 MockRenderWidgetHostDelegate delegate_;
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 284
283 browser_plugin_guest_->set_attached(false); 285 browser_plugin_guest_->set_attached(false);
284 browser_plugin_guest_->ResetTestData(); 286 browser_plugin_guest_->ResetTestData();
285 287
286 view_->OnSwapCompositorFrame( 288 view_->OnSwapCompositorFrame(
287 0, CreateDelegatedFrame(scale_factor, view_size, view_rect)); 289 0, CreateDelegatedFrame(scale_factor, view_size, view_rect));
288 EXPECT_TRUE(surface_id().is_null()); 290 EXPECT_TRUE(surface_id().is_null());
289 } 291 }
290 292
291 } // namespace content 293 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698