| Index: chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc
|
| index 3583970b6b6903d4d0a0bd126c3c619e17cc7a34..834bad0491936b57dbfe6701a8d78920d03a2ec6 100644
|
| --- a/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc
|
| +++ b/chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc
|
| @@ -151,7 +151,7 @@ WebSocketProxyPrivateGetURLForTCPFunction::
|
|
|
| void WebSocketProxyPrivateGetURLForTCPFunction::CustomFinalize() {
|
| #if defined(OS_CHROMEOS)
|
| - std::string passport = browser::InternalAuthGeneration::GeneratePassport(
|
| + std::string passport = chrome::InternalAuthGeneration::GeneratePassport(
|
| "web_socket_proxy", map_);
|
| std::string query = std::string("hostname=") +
|
| net::EscapeQueryParamValue(hostname_, false) + "&port=" + map_["port"] +
|
| @@ -197,9 +197,8 @@ WebSocketProxyPrivateGetPassportForTCPFunction::
|
|
|
| void WebSocketProxyPrivateGetPassportForTCPFunction::CustomFinalize() {
|
| #if defined(OS_CHROMEOS)
|
| - std::string passport =
|
| - browser::InternalAuthGeneration::GeneratePassport(
|
| - "web_socket_proxy", map_) + std::string(":");
|
| + std::string passport = chrome::InternalAuthGeneration::GeneratePassport(
|
| + "web_socket_proxy", map_) + std::string(":");
|
| if (ContainsKey(map_, "addr"))
|
| passport += map_["addr"];
|
| result_.reset(Value::CreateStringValue(passport));
|
|
|