| Index: third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| diff --git a/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| index 5db02b66eaf7e2bdde8f5a70be738455ba20d20d..14d95947e79f051c467a224fc70679dafe16fde7 100644
|
| --- a/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| +++ b/third_party/WebKit/Source/core/inspector/InspectorTracingAgent.cpp
|
| @@ -66,7 +66,7 @@ void InspectorTracingAgent::end(ErrorString* errorString, PassOwnPtr<EndCallback
|
|
|
| String InspectorTracingAgent::sessionId()
|
| {
|
| - String result;
|
| + String16 result;
|
| if (m_state)
|
| m_state->getString(TracingAgentState::sessionId, &result);
|
| return result;
|
| @@ -94,7 +94,7 @@ void InspectorTracingAgent::disable(ErrorString*)
|
| void InspectorTracingAgent::resetSessionId()
|
| {
|
| m_state->remove(TracingAgentState::sessionId);
|
| - m_workerAgent->setTracingSessionId(sessionId());
|
| + m_workerAgent->setTracingSessionId(String());
|
| }
|
|
|
| } // namespace blink
|
|
|