OLD | NEW |
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 "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/location.h" | 13 #include "base/location.h" |
14 #include "base/memory/discardable_memory.h" | 14 #include "base/memory/discardable_memory.h" |
15 #include "base/run_loop.h" | 15 #include "base/run_loop.h" |
16 #include "base/single_thread_task_runner.h" | 16 #include "base/single_thread_task_runner.h" |
17 #include "base/strings/string_number_conversions.h" | 17 #include "base/strings/string_number_conversions.h" |
18 #include "base/threading/thread_task_runner_handle.h" | 18 #include "base/threading/thread_task_runner_handle.h" |
19 #include "cc/output/buffer_to_texture_target_map.h" | 19 #include "cc/output/buffer_to_texture_target_map.h" |
20 #include "components/scheduler/renderer/renderer_scheduler.h" | 20 #include "components/scheduler/renderer/renderer_scheduler.h" |
21 #include "content/app/mojo/mojo_init.h" | 21 #include "content/app/mojo/mojo_init.h" |
22 #include "content/common/in_process_child_thread_params.h" | 22 #include "content/common/in_process_child_thread_params.h" |
23 #include "content/common/resource_messages.h" | 23 #include "content/common/resource_messages.h" |
24 #include "content/common/websocket_messages.h" | |
25 #include "content/public/browser/content_browser_client.h" | 24 #include "content/public/browser/content_browser_client.h" |
26 #include "content/public/common/content_client.h" | 25 #include "content/public/common/content_client.h" |
27 #include "content/public/common/content_switches.h" | 26 #include "content/public/common/content_switches.h" |
28 #include "content/public/renderer/content_renderer_client.h" | 27 #include "content/public/renderer/content_renderer_client.h" |
29 #include "content/renderer/render_process_impl.h" | 28 #include "content/renderer/render_process_impl.h" |
30 #include "content/test/mock_render_process.h" | 29 #include "content/test/mock_render_process.h" |
31 #include "content/test/render_thread_impl_browser_test_ipc_helper.h" | 30 #include "content/test/render_thread_impl_browser_test_ipc_helper.h" |
32 #include "gpu/GLES2/gl2extchromium.h" | 31 #include "gpu/GLES2/gl2extchromium.h" |
33 #include "testing/gtest/include/gtest/gtest.h" | 32 #include "testing/gtest/include/gtest/gtest.h" |
34 | 33 |
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 | 224 |
226 base::RunLoop().Run(); | 225 base::RunLoop().Run(); |
227 EXPECT_EQ(1, test_task_counter_->NumTasksPosted()); | 226 EXPECT_EQ(1, test_task_counter_->NumTasksPosted()); |
228 } | 227 } |
229 | 228 |
230 // Disabled under LeakSanitizer due to memory leaks. | 229 // Disabled under LeakSanitizer due to memory leaks. |
231 TEST_F(RenderThreadImplBrowserTest, | 230 TEST_F(RenderThreadImplBrowserTest, |
232 WILL_LEAK(NonResourceDispatchIPCTasksDontGoThroughScheduler)) { | 231 WILL_LEAK(NonResourceDispatchIPCTasksDontGoThroughScheduler)) { |
233 // NOTE other than not being a resource message, the actual message is | 232 // NOTE other than not being a resource message, the actual message is |
234 // unimportant. | 233 // unimportant. |
235 test_helper_->Sender()->Send(new WebSocketMsg_NotifyFailure(1, "")); | |
236 test_helper_->Sender()->Send(new TestMsg_QuitRunLoop()); | 234 test_helper_->Sender()->Send(new TestMsg_QuitRunLoop()); |
237 | 235 |
238 base::RunLoop().Run(); | 236 base::RunLoop().Run(); |
239 | 237 |
240 EXPECT_EQ(0, test_task_counter_->NumTasksPosted()); | 238 EXPECT_EQ(0, test_task_counter_->NumTasksPosted()); |
241 } | 239 } |
242 | 240 |
243 } // namespace | 241 } // namespace |
244 } // namespace content | 242 } // namespace content |
OLD | NEW |