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

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

Issue 665923002: Moves RenderProcessHostImpl::init_time() to RenderProcessHost to fix broken test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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_process_host.h" 5 #include "content/public/test/mock_render_process_host.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "content/browser/child_process_security_policy_impl.h" 10 #include "content/browser/child_process_security_policy_impl.h"
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 void MockRenderProcessHost::ResumeRequestsForView(int route_id) { 215 void MockRenderProcessHost::ResumeRequestsForView(int route_id) {
216 } 216 }
217 217
218 void MockRenderProcessHost::NotifyTimezoneChange() { 218 void MockRenderProcessHost::NotifyTimezoneChange() {
219 } 219 }
220 220
221 ServiceRegistry* MockRenderProcessHost::GetServiceRegistry() { 221 ServiceRegistry* MockRenderProcessHost::GetServiceRegistry() {
222 return NULL; 222 return NULL;
223 } 223 }
224 224
225 const base::TimeTicks& MockRenderProcessHost::init_time() const {
226 static base::TimeTicks dummy_time = base::TimeTicks::Now();
227 return dummy_time;
228 }
229
225 void MockRenderProcessHost::FilterURL(bool empty_allowed, GURL* url) { 230 void MockRenderProcessHost::FilterURL(bool empty_allowed, GURL* url) {
226 RenderProcessHostImpl::FilterURL(this, empty_allowed, url); 231 RenderProcessHostImpl::FilterURL(this, empty_allowed, url);
227 } 232 }
228 233
229 #if defined(ENABLE_WEBRTC) 234 #if defined(ENABLE_WEBRTC)
230 void MockRenderProcessHost::EnableAecDump(const base::FilePath& file) { 235 void MockRenderProcessHost::EnableAecDump(const base::FilePath& file) {
231 } 236 }
232 237
233 void MockRenderProcessHost::DisableAecDump() { 238 void MockRenderProcessHost::DisableAecDump() {
234 } 239 }
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 for (ScopedVector<MockRenderProcessHost>::iterator it = processes_.begin(); 290 for (ScopedVector<MockRenderProcessHost>::iterator it = processes_.begin();
286 it != processes_.end(); ++it) { 291 it != processes_.end(); ++it) {
287 if (*it == host) { 292 if (*it == host) {
288 processes_.weak_erase(it); 293 processes_.weak_erase(it);
289 break; 294 break;
290 } 295 }
291 } 296 }
292 } 297 }
293 298
294 } // content 299 } // content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698