Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index 19cf3ba62b9cc004bd77ca81aa4afb110b54bdf0..04832343d660370f78ad7866a26d590ff0d7ffe3 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -1530,16 +1530,16 @@ void ThreadProxy::CommitPendingOnImplThreadForTesting( |
request->completion.Signal(); |
} |
-scoped_ptr<base::Value> ThreadProxy::SchedulerStateAsValueForTesting() { |
+scoped_ptr<base::Value> ThreadProxy::SchedulerAsValueForTesting() { |
if (IsImplThread()) |
- return impl().scheduler->StateAsValue().Pass(); |
+ return impl().scheduler->AsValue().Pass(); |
SchedulerStateRequest scheduler_state_request; |
{ |
DebugScopedSetMainThreadBlocked main_thread_blocked(this); |
Proxy::ImplThreadTaskRunner()->PostTask( |
FROM_HERE, |
- base::Bind(&ThreadProxy::SchedulerStateAsValueOnImplThreadForTesting, |
+ base::Bind(&ThreadProxy::SchedulerAsValueOnImplThreadForTesting, |
impl_thread_weak_ptr_, |
&scheduler_state_request)); |
scheduler_state_request.completion.Wait(); |
@@ -1547,10 +1547,10 @@ scoped_ptr<base::Value> ThreadProxy::SchedulerStateAsValueForTesting() { |
return scheduler_state_request.state.Pass(); |
} |
-void ThreadProxy::SchedulerStateAsValueOnImplThreadForTesting( |
+void ThreadProxy::SchedulerAsValueOnImplThreadForTesting( |
SchedulerStateRequest* request) { |
DCHECK(IsImplThread()); |
- request->state = impl().scheduler->StateAsValue(); |
+ request->state = impl().scheduler->AsValue(); |
request->completion.Signal(); |
} |