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

Side by Side Diff: content/renderer/render_thread_impl_browsertest.cc

Issue 1488853002: Add multiplexing of message pipes in the new EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tsepez review comments Created 5 years 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
« no previous file with comments | « content/renderer/DEPS ('k') | mojo/edk/embedder/embedder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/callback.h" 5 #include "base/callback.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/memory/discardable_memory.h" 8 #include "base/memory/discardable_memory.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/thread_task_runner_handle.h" 11 #include "base/thread_task_runner_handle.h"
12 #include "components/scheduler/renderer/renderer_scheduler.h" 12 #include "components/scheduler/renderer/renderer_scheduler.h"
13 #include "content/app/mojo/mojo_init.h"
13 #include "content/common/in_process_child_thread_params.h" 14 #include "content/common/in_process_child_thread_params.h"
14 #include "content/common/resource_messages.h" 15 #include "content/common/resource_messages.h"
15 #include "content/common/websocket_messages.h" 16 #include "content/common/websocket_messages.h"
16 #include "content/public/browser/content_browser_client.h" 17 #include "content/public/browser/content_browser_client.h"
17 #include "content/public/common/content_client.h" 18 #include "content/public/common/content_client.h"
18 #include "content/public/common/content_switches.h" 19 #include "content/public/common/content_switches.h"
19 #include "content/public/renderer/content_renderer_client.h" 20 #include "content/public/renderer/content_renderer_client.h"
20 #include "content/renderer/render_process_impl.h" 21 #include "content/renderer/render_process_impl.h"
21 #include "content/renderer/render_thread_impl.h" 22 #include "content/renderer/render_thread_impl.h"
22 #include "content/test/mock_render_process.h" 23 #include "content/test/mock_render_process.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 for (size_t format = 0; 167 for (size_t format = 0;
167 format < static_cast<size_t>(gfx::BufferFormat::LAST) + 1; format++) { 168 format < static_cast<size_t>(gfx::BufferFormat::LAST) + 1; format++) {
168 if (!image_targets.empty()) 169 if (!image_targets.empty())
169 image_targets += ","; 170 image_targets += ",";
170 image_targets += base::UintToString(GL_TEXTURE_2D); 171 image_targets += base::UintToString(GL_TEXTURE_2D);
171 } 172 }
172 cmd->AppendSwitchASCII(switches::kContentImageTextureTarget, image_targets); 173 cmd->AppendSwitchASCII(switches::kContentImageTextureTarget, image_targets);
173 174
174 scoped_ptr<scheduler::RendererScheduler> renderer_scheduler = 175 scoped_ptr<scheduler::RendererScheduler> renderer_scheduler =
175 scheduler::RendererScheduler::Create(); 176 scheduler::RendererScheduler::Create();
177 InitializeMojo();
176 thread_ = new RenderThreadImplForTest( 178 thread_ = new RenderThreadImplForTest(
177 InProcessChildThreadParams(test_helper_->GetChannelId(), 179 InProcessChildThreadParams(test_helper_->GetChannelId(),
178 test_helper_->GetIOTaskRunner()), 180 test_helper_->GetIOTaskRunner()),
179 renderer_scheduler.Pass(), test_task_counter_); 181 renderer_scheduler.Pass(), test_task_counter_);
180 cmd->InitFromArgv(old_argv); 182 cmd->InitFromArgv(old_argv);
181 183
182 thread_->EnsureWebKitInitialized(); 184 thread_->EnsureWebKitInitialized();
183 185
184 test_msg_filter_ = make_scoped_refptr( 186 test_msg_filter_ = make_scoped_refptr(
185 new QuitOnTestMsgFilter(test_helper_->GetMessageLoop())); 187 new QuitOnTestMsgFilter(test_helper_->GetMessageLoop()));
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 test_helper_->Sender()->Send(new WebSocketMsg_NotifyFailure(1, "")); 232 test_helper_->Sender()->Send(new WebSocketMsg_NotifyFailure(1, ""));
231 test_helper_->Sender()->Send(new TestMsg_QuitRunLoop()); 233 test_helper_->Sender()->Send(new TestMsg_QuitRunLoop());
232 234
233 test_helper_->GetMessageLoop()->Run(); 235 test_helper_->GetMessageLoop()->Run();
234 236
235 EXPECT_EQ(0, test_task_counter_->NumTasksPosted()); 237 EXPECT_EQ(0, test_task_counter_->NumTasksPosted());
236 } 238 }
237 239
238 } // namespace 240 } // namespace
239 } // namespace content 241 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/DEPS ('k') | mojo/edk/embedder/embedder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698