| Index: third_party/WebKit/Source/platform/v8_inspector/V8ProfilerAgentImpl.cpp | 
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8ProfilerAgentImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8ProfilerAgentImpl.cpp | 
| index 096ad2b90beb185469abae291355fe2099c21c42..cbe769f13ed5a0ed5da947ca7554badaf96618f3 100644 | 
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8ProfilerAgentImpl.cpp | 
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8ProfilerAgentImpl.cpp | 
| @@ -53,9 +53,9 @@ PassOwnPtr<protocol::Profiler::CPUProfileNode> buildInspectorObjectFor(v8::Isola | 
| OwnPtr<protocol::Array<protocol::Profiler::PositionTickInfo>> positionTicks = buildInspectorObjectForPositionTicks(node); | 
|  | 
| OwnPtr<protocol::Profiler::CPUProfileNode> result = protocol::Profiler::CPUProfileNode::create() | 
| -        .setFunctionName(toWTFString(node->GetFunctionName())) | 
| -        .setScriptId(String::number(node->GetScriptId())) | 
| -        .setUrl(toWTFString(node->GetScriptResourceName())) | 
| +        .setFunctionName(toProtocolString(node->GetFunctionName())) | 
| +        .setScriptId(String16::number(node->GetScriptId())) | 
| +        .setUrl(toProtocolString(node->GetScriptResourceName())) | 
| .setLineNumber(node->GetLineNumber()) | 
| .setColumnNumber(node->GetColumnNumber()) | 
| .setHitCount(node->GetHitCount()) | 
| @@ -112,11 +112,11 @@ volatile int s_lastProfileId = 0; | 
|  | 
| class V8ProfilerAgentImpl::ProfileDescriptor { | 
| public: | 
| -    ProfileDescriptor(const String& id, const String& title) | 
| +    ProfileDescriptor(const String16& id, const String16& title) | 
| : m_id(id) | 
| , m_title(title) { } | 
| -    String m_id; | 
| -    String m_title; | 
| +    String16 m_id; | 
| +    String16 m_title; | 
| }; | 
|  | 
| PassOwnPtr<V8ProfilerAgent> V8ProfilerAgent::create(V8Debugger* debugger) | 
| @@ -138,20 +138,20 @@ V8ProfilerAgentImpl::~V8ProfilerAgentImpl() | 
| { | 
| } | 
|  | 
| -void V8ProfilerAgentImpl::consoleProfile(const String& title) | 
| +void V8ProfilerAgentImpl::consoleProfile(const String16& title) | 
| { | 
| ASSERT(m_frontend && m_enabled); | 
| -    String id = nextProfileId(); | 
| +    String16 id = nextProfileId(); | 
| m_startedProfiles.append(ProfileDescriptor(id, title)); | 
| startProfiling(id); | 
| m_frontend->consoleProfileStarted(id, currentDebugLocation(m_debugger), title); | 
| } | 
|  | 
| -void V8ProfilerAgentImpl::consoleProfileEnd(const String& title) | 
| +void V8ProfilerAgentImpl::consoleProfileEnd(const String16& title) | 
| { | 
| ASSERT(m_frontend && m_enabled); | 
| -    String id; | 
| -    String resolvedTitle; | 
| +    String16 id; | 
| +    String16 resolvedTitle; | 
| // Take last started profile if no title was passed. | 
| if (title.isNull()) { | 
| if (m_startedProfiles.isEmpty()) | 
| @@ -251,22 +251,22 @@ void V8ProfilerAgentImpl::stop(ErrorString* errorString, OwnPtr<protocol::Profil | 
| if (!profile->get() && errorString) | 
| *errorString = "Profile is not found"; | 
| } | 
| -    m_frontendInitiatedProfileId = String(); | 
| +    m_frontendInitiatedProfileId = String16(); | 
| m_state->setBoolean(ProfilerAgentState::userInitiatedProfiling, false); | 
| } | 
|  | 
| -String V8ProfilerAgentImpl::nextProfileId() | 
| +String16 V8ProfilerAgentImpl::nextProfileId() | 
| { | 
| -    return String::number(atomicIncrement(&s_lastProfileId)); | 
| +    return String16::number(atomicIncrement(&s_lastProfileId)); | 
| } | 
|  | 
| -void V8ProfilerAgentImpl::startProfiling(const String& title) | 
| +void V8ProfilerAgentImpl::startProfiling(const String16& title) | 
| { | 
| v8::HandleScope handleScope(m_isolate); | 
| m_isolate->GetCpuProfiler()->StartProfiling(toV8String(m_isolate, title), true); | 
| } | 
|  | 
| -PassOwnPtr<protocol::Profiler::CPUProfile> V8ProfilerAgentImpl::stopProfiling(const String& title, bool serialize) | 
| +PassOwnPtr<protocol::Profiler::CPUProfile> V8ProfilerAgentImpl::stopProfiling(const String16& title, bool serialize) | 
| { | 
| v8::HandleScope handleScope(m_isolate); | 
| v8::CpuProfile* profile = m_isolate->GetCpuProfiler()->StopProfiling(toV8String(m_isolate, title)); | 
|  |