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

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

Issue 982413002: base: Stop passing a non-const ref to ObserverListBase::Iterator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: observerref: fixwindowsbuild Created 5 years, 9 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 (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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 // The Frame expects to be returned a valid route_id different from its own. 227 // The Frame expects to be returned a valid route_id different from its own.
228 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id, 228 void MockRenderThread::OnCreateChildFrame(int new_frame_routing_id,
229 const std::string& frame_name, 229 const std::string& frame_name,
230 SandboxFlags sandbox_flags, 230 SandboxFlags sandbox_flags,
231 int* new_render_frame_id) { 231 int* new_render_frame_id) {
232 *new_render_frame_id = new_frame_routing_id_++; 232 *new_render_frame_id = new_frame_routing_id_++;
233 } 233 }
234 234
235 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) { 235 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
236 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); 236 ObserverListBase<RenderProcessObserver>::Iterator it(&observers_);
237 RenderProcessObserver* observer; 237 RenderProcessObserver* observer;
238 while ((observer = it.GetNext()) != NULL) { 238 while ((observer = it.GetNext()) != NULL) {
239 if (observer->OnControlMessageReceived(msg)) 239 if (observer->OnControlMessageReceived(msg))
240 return true; 240 return true;
241 } 241 }
242 return OnMessageReceived(msg); 242 return OnMessageReceived(msg);
243 } 243 }
244 244
245 bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) { 245 bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) {
246 // Save the message in the sink. 246 // Save the message in the sink.
(...skipping 13 matching lines...) Expand all
260 void MockRenderThread::OnDuplicateSection( 260 void MockRenderThread::OnDuplicateSection(
261 base::SharedMemoryHandle renderer_handle, 261 base::SharedMemoryHandle renderer_handle,
262 base::SharedMemoryHandle* browser_handle) { 262 base::SharedMemoryHandle* browser_handle) {
263 // We don't have to duplicate the input handles since RenderViewTest does not 263 // We don't have to duplicate the input handles since RenderViewTest does not
264 // separate a browser process from a renderer process. 264 // separate a browser process from a renderer process.
265 *browser_handle = renderer_handle; 265 *browser_handle = renderer_handle;
266 } 266 }
267 #endif // defined(OS_WIN) 267 #endif // defined(OS_WIN)
268 268
269 } // namespace content 269 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_impl.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698