Index: third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp |
diff --git a/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp |
index fefd9367f087b861ecbe638b2ca04690351915db..b221302d3fff4fd03ddc04d2ccf82f0e637ef079 100644 |
--- a/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp |
+++ b/third_party/WebKit/Source/core/inspector/InspectorProfilerAgent.cpp |
@@ -86,13 +86,13 @@ void InspectorProfilerAgent::restore() |
} |
// Protocol implementation. |
-void InspectorProfilerAgent::consoleProfile(ExecutionContext* context, const String& title) |
+void InspectorProfilerAgent::consoleProfile(ExecutionContext* context, const String16& title) |
{ |
UseCounter::count(context, UseCounter::DevToolsConsoleProfile); |
m_v8ProfilerAgent->consoleProfile(title); |
} |
-void InspectorProfilerAgent::consoleProfileEnd(const String& title) |
+void InspectorProfilerAgent::consoleProfileEnd(const String16& title) |
{ |
m_v8ProfilerAgent->consoleProfileEnd(title); |
} |
@@ -119,7 +119,7 @@ void InspectorProfilerAgent::setSamplingInterval(ErrorString* error, int interva |
void InspectorProfilerAgent::start(ErrorString* error) |
{ |
m_v8ProfilerAgent->start(error); |
- if (m_client && !*error) |
+ if (m_client && error->isEmpty()) |
m_client->profilingStarted(); |
} |