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

Side by Side Diff: content/public/test/mock_render_thread.cc

Issue 838193002: Fix CrOS FileManagerBrowserTest with scheduler enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't need change to renderer_accessibility.cc Created 5 years, 11 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
« no previous file with comments | « no previous file | content/renderer/render_widget.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/public/test/mock_render_thread.h" 5 #include "content/public/test/mock_render_thread.h"
6 6
7 #include "base/message_loop/message_loop_proxy.h" 7 #include "base/message_loop/message_loop_proxy.h"
8 #include "content/common/frame_messages.h" 8 #include "content/common/frame_messages.h"
9 #include "content/common/view_messages.h" 9 #include "content/common/view_messages.h"
10 #include "content/public/renderer/render_process_observer.h" 10 #include "content/public/renderer/render_process_observer.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 if (msg->routing_id() == MSG_ROUTING_CONTROL) 56 if (msg->routing_id() == MSG_ROUTING_CONTROL)
57 OnControlMessageReceived(*msg); 57 OnControlMessageReceived(*msg);
58 else 58 else
59 OnMessageReceived(*msg); 59 OnMessageReceived(*msg);
60 } 60 }
61 delete msg; 61 delete msg;
62 return true; 62 return true;
63 } 63 }
64 64
65 scoped_refptr<base::SingleThreadTaskRunner> MockRenderThread::GetTaskRunner() { 65 scoped_refptr<base::SingleThreadTaskRunner> MockRenderThread::GetTaskRunner() {
66 return scoped_refptr<base::MessageLoopProxy>(); 66 return base::MessageLoopProxy::current();
67 } 67 }
68 68
69 IPC::SyncChannel* MockRenderThread::GetChannel() { 69 IPC::SyncChannel* MockRenderThread::GetChannel() {
70 return NULL; 70 return NULL;
71 } 71 }
72 72
73 std::string MockRenderThread::GetLocale() { 73 std::string MockRenderThread::GetLocale() {
74 return "en-US"; 74 return "en-US";
75 } 75 }
76 76
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 void MockRenderThread::OnDuplicateSection( 259 void MockRenderThread::OnDuplicateSection(
260 base::SharedMemoryHandle renderer_handle, 260 base::SharedMemoryHandle renderer_handle,
261 base::SharedMemoryHandle* browser_handle) { 261 base::SharedMemoryHandle* browser_handle) {
262 // We don't have to duplicate the input handles since RenderViewTest does not 262 // We don't have to duplicate the input handles since RenderViewTest does not
263 // separate a browser process from a renderer process. 263 // separate a browser process from a renderer process.
264 *browser_handle = renderer_handle; 264 *browser_handle = renderer_handle;
265 } 265 }
266 #endif // defined(OS_WIN) 266 #endif // defined(OS_WIN)
267 267
268 } // namespace content 268 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698