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

Unified Diff: content/renderer/render_thread_impl_browsertest.cc

Issue 1227303002: Set listener task runner before connect channel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix trybot error. Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/renderer_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread_impl_browsertest.cc
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc
index 6a06f9e19def707690b7f95332936c1bfb1e943a..b722b29fd3713f98e959e00020809d3dd6244fdf 100644
--- a/content/renderer/render_thread_impl_browsertest.cc
+++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -10,6 +10,7 @@
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/thread_task_runner_handle.h"
+#include "components/scheduler/renderer/renderer_scheduler.h"
#include "content/common/in_process_child_thread_params.h"
#include "content/common/resource_messages.h"
#include "content/common/websocket_messages.h"
@@ -91,8 +92,10 @@ class TestTaskCounter : public base::SingleThreadTaskRunner {
class RenderThreadImplForTest : public RenderThreadImpl {
public:
RenderThreadImplForTest(const InProcessChildThreadParams& params,
+ scoped_ptr<scheduler::RendererScheduler> scheduler,
scoped_refptr<TestTaskCounter> test_task_counter)
- : RenderThreadImpl(params), test_task_counter_(test_task_counter) {}
+ : RenderThreadImpl(params, scheduler.Pass()),
+ test_task_counter_(test_task_counter) {}
~RenderThreadImplForTest() override {}
@@ -163,10 +166,12 @@ class RenderThreadImplBrowserTest : public testing::Test {
cmd->AppendSwitchASCII(switches::kContentImageTextureTarget,
base::UintToString(GL_TEXTURE_2D));
+ scoped_ptr<scheduler::RendererScheduler> renderer_scheduler =
+ scheduler::RendererScheduler::Create();
thread_ = new RenderThreadImplForTest(
InProcessChildThreadParams(test_helper_->GetChannelId(),
test_helper_->GetIOTaskRunner()),
- test_task_counter_);
+ renderer_scheduler.Pass(), test_task_counter_);
cmd->InitFromArgv(old_argv);
thread_->EnsureWebKitInitialized();
« no previous file with comments | « content/renderer/render_thread_impl.cc ('k') | content/renderer/renderer_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698