| Index: third_party/WebKit/Source/platform/inspector_protocol/ErrorSupport_cpp.template
 | 
| diff --git a/third_party/WebKit/Source/platform/inspector_protocol/ErrorSupport_cpp.template b/third_party/WebKit/Source/platform/inspector_protocol/ErrorSupport_cpp.template
 | 
| index 695cb58dc3867fd31fe38bb7e913447eb5e7bea2..34593ec13de84d3f3a948fbb3022f1a645683d81 100644
 | 
| --- a/third_party/WebKit/Source/platform/inspector_protocol/ErrorSupport_cpp.template
 | 
| +++ b/third_party/WebKit/Source/platform/inspector_protocol/ErrorSupport_cpp.template
 | 
| @@ -2,22 +2,25 @@
 | 
|  // Use of this source code is governed by a BSD-style license that can be
 | 
|  // found in the LICENSE file.
 | 
|  
 | 
| -namespace blink {
 | 
| -namespace protocol {
 | 
| +//#include "ErrorSupport.h"
 | 
| +
 | 
| +{% for namespace in config.protocol.namespace %}
 | 
| +namespace {{namespace}} {
 | 
| +{% endfor %}
 | 
|  
 | 
|  ErrorSupport::ErrorSupport() : m_errorString(nullptr) { }
 | 
| -ErrorSupport::ErrorSupport(String16* errorString) : m_errorString(errorString) { }
 | 
| +ErrorSupport::ErrorSupport(String* errorString) : m_errorString(errorString) { }
 | 
|  ErrorSupport::~ErrorSupport()
 | 
|  {
 | 
|      if (m_errorString && hasErrors()) {
 | 
| -        String16Builder builder;
 | 
| +        StringBuilder builder;
 | 
|          builder.append("Internal error(s): ");
 | 
|          builder.append(errors());
 | 
|          *m_errorString = builder.toString();
 | 
|      }
 | 
|  }
 | 
|  
 | 
| -void ErrorSupport::setName(const String16& name)
 | 
| +void ErrorSupport::setName(const String& name)
 | 
|  {
 | 
|      DCHECK(m_path.size());
 | 
|      m_path[m_path.size() - 1] = name;
 | 
| @@ -25,7 +28,7 @@ void ErrorSupport::setName(const String16& name)
 | 
|  
 | 
|  void ErrorSupport::push()
 | 
|  {
 | 
| -    m_path.push_back(String16());
 | 
| +    m_path.push_back(String());
 | 
|  }
 | 
|  
 | 
|  void ErrorSupport::pop()
 | 
| @@ -33,9 +36,9 @@ void ErrorSupport::pop()
 | 
|      m_path.pop_back();
 | 
|  }
 | 
|  
 | 
| -void ErrorSupport::addError(const String16& error)
 | 
| +void ErrorSupport::addError(const String& error)
 | 
|  {
 | 
| -    String16Builder builder;
 | 
| +    StringBuilder builder;
 | 
|      for (size_t i = 0; i < m_path.size(); ++i) {
 | 
|          if (i)
 | 
|              builder.append('.');
 | 
| @@ -51,9 +54,9 @@ bool ErrorSupport::hasErrors()
 | 
|      return m_errors.size();
 | 
|  }
 | 
|  
 | 
| -String16 ErrorSupport::errors()
 | 
| +String ErrorSupport::errors()
 | 
|  {
 | 
| -    String16Builder builder;
 | 
| +    StringBuilder builder;
 | 
|      for (size_t i = 0; i < m_errors.size(); ++i) {
 | 
|          if (i)
 | 
|              builder.append("; ");
 | 
| @@ -62,5 +65,6 @@ String16 ErrorSupport::errors()
 | 
|      return builder.toString();
 | 
|  }
 | 
|  
 | 
| -} // namespace protocol
 | 
| -} // namespace blink
 | 
| +{% for namespace in config.protocol.namespace %}
 | 
| +} // namespace {{namespace}}
 | 
| +{% endfor %}
 | 
| 
 |