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

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

Issue 2410283004: Remove usage of base::ObserverList<T>::Iter::GetNext() in //content. (Closed)
Patch Set: Created 4 years, 2 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/logging.h" 7 #include "base/logging.h"
8 #include "base/single_thread_task_runner.h" 8 #include "base/single_thread_task_runner.h"
9 #include "base/threading/thread_task_runner_handle.h" 9 #include "base/threading/thread_task_runner_handle.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 } 262 }
263 263
264 // The Frame expects to be returned a valid route_id different from its own. 264 // The Frame expects to be returned a valid route_id different from its own.
265 void MockRenderThread::OnCreateChildFrame( 265 void MockRenderThread::OnCreateChildFrame(
266 const FrameHostMsg_CreateChildFrame_Params& params, 266 const FrameHostMsg_CreateChildFrame_Params& params,
267 int* new_render_frame_id) { 267 int* new_render_frame_id) {
268 *new_render_frame_id = new_frame_routing_id_++; 268 *new_render_frame_id = new_frame_routing_id_++;
269 } 269 }
270 270
271 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) { 271 bool MockRenderThread::OnControlMessageReceived(const IPC::Message& msg) {
272 base::ObserverListBase<RenderThreadObserver>::Iterator it(&observers_); 272 for (auto& observer : observers_) {
273 RenderThreadObserver* observer; 273 if (observer.OnControlMessageReceived(msg))
274 while ((observer = it.GetNext()) != NULL) {
275 if (observer->OnControlMessageReceived(msg))
276 return true; 274 return true;
277 } 275 }
278 return OnMessageReceived(msg); 276 return OnMessageReceived(msg);
279 } 277 }
280 278
281 bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) { 279 bool MockRenderThread::OnMessageReceived(const IPC::Message& msg) {
282 // Save the message in the sink. 280 // Save the message in the sink.
283 sink_.OnMessageReceived(msg); 281 sink_.OnMessageReceived(msg);
284 282
285 bool handled = true; 283 bool handled = true;
(...skipping 19 matching lines...) Expand all
305 void MockRenderThread::OnCreateWindow( 303 void MockRenderThread::OnCreateWindow(
306 const mojom::CreateNewWindowParams& params, 304 const mojom::CreateNewWindowParams& params,
307 mojom::CreateNewWindowReply* reply) { 305 mojom::CreateNewWindowReply* reply) {
308 reply->route_id = new_window_routing_id_; 306 reply->route_id = new_window_routing_id_;
309 reply->main_frame_route_id = new_window_main_frame_routing_id_; 307 reply->main_frame_route_id = new_window_main_frame_routing_id_;
310 reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_; 308 reply->main_frame_widget_route_id = new_window_main_frame_widget_routing_id_;
311 reply->cloned_session_storage_namespace_id = 0; 309 reply->cloned_session_storage_namespace_id = 0;
312 } 310 }
313 311
314 } // namespace content 312 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698