websocket-to-TCP proxy: observe value of listening port in right place.

chrome/browser/extensions/extension_web_socket_proxy_private_api.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_web_socket_proxy_private_api.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/internal_auth.h"
@@ skipping 23 matching lines @@
   NOTREACHED();
 #endif
   timer_.Stop();  // Cancel timeout timer.
   Finalize();
 }
 
 void WebSocketProxyPrivate::Finalize() {
   if (is_finalized_)
     return;
   is_finalized_ = true;
-  SendResponse(true);
+  SendResponse(listening_port_ > 0);
   Release();
 }
 
 WebSocketProxyPrivateGetPassportForTCPFunction::
     WebSocketProxyPrivateGetPassportForTCPFunction() {
   // This obsolete API uses fixed port to listen websocket connections.
   listening_port_ = 10101;
 }
 
 void WebSocketProxyPrivateGetURLForTCPFunction::Observe(
     int type, const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   listening_port_ = *content::Details<int>(details).ptr();
   WebSocketProxyPrivate::Observe(type, source, details);
 }
 
 void WebSocketProxyPrivateGetURLForTCPFunction::Finalize() {
+#if defined(OS_CHROMEOS)
   StringValue* url = Value::CreateStringValue(std::string(
       "ws://127.0.0.1:" + base::IntToString(listening_port_) +
       "/tcpproxy?" + query_));
   result_.reset(url);
+  if (listening_port_ < 1)
+    listening_port_ = chromeos::WebSocketProxyController::GetPort();
+#endif
   WebSocketProxyPrivate::Finalize();
 }
 
 bool WebSocketProxyPrivateGetPassportForTCPFunction::RunImpl() {
   AddRef();
   bool delay_response = false;
   result_.reset(Value::CreateStringValue(""));
 
 #if defined(OS_CHROMEOS)
   std::string hostname;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &hostname));
   int port = -1;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(1, &port));
 
   if (chromeos::WebSocketProxyController::CheckCredentials(
           extension_id(), hostname, port,
           chromeos::WebSocketProxyController::PLAIN_TCP)) {
-    if (!chromeos::WebSocketProxyController::IsInitiated()) {
+    listening_port_ = chromeos::WebSocketProxyController::GetPort();
+    if (listening_port_ < 1) {
       delay_response = true;
       registrar_.Add(
           this, chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED,
           content::NotificationService::AllSources());
-      chromeos::WebSocketProxyController::Initiate();
     }
 
     std::map<std::string, std::string> map;
     map["hostname"] = hostname;
     map["port"] = base::IntToString(port);
     map["extension_id"] = extension_id();
     StringValue* passport = Value::CreateStringValue(
         browser::InternalAuthGeneration::GeneratePassport(
             "web_socket_proxy", map));
     result_.reset(passport);
@@ skipping 26 matching lines @@
     const char kTlsOption[] = "tls";
     if (qualification->HasKey(kTlsOption)) {
       EXTENSION_FUNCTION_VALIDATE(qualification->GetBoolean(
           kTlsOption, &do_tls));
     }
   }
   if (chromeos::WebSocketProxyController::CheckCredentials(
           extension_id(), hostname, port,
           do_tls ? chromeos::WebSocketProxyController::TLS_OVER_TCP :
               chromeos::WebSocketProxyController::PLAIN_TCP)) {
-    if (!chromeos::WebSocketProxyController::IsInitiated()) {
+    listening_port_ = chromeos::WebSocketProxyController::GetPort();
+    if (listening_port_ < 1) {
       delay_response = true;
       registrar_.Add(
           this, chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED,
           content::NotificationService::AllSources());
-      chromeos::WebSocketProxyController::Initiate();
     }
 
     std::map<std::string, std::string> map;
     map["hostname"] = hostname;
     map["port"] = base::IntToString(port);
     map["extension_id"] = extension_id();
     map["tls"] = do_tls ? "true" : "false";
     std::string passport = browser::InternalAuthGeneration::GeneratePassport(
         "web_socket_proxy", map);
     query_ = std::string("hostname=") +
         net::EscapeQueryParamValue(hostname, false) + "&port=" + map["port"] +
         "&tls=" + map["tls"] + "&passport=" +
         net::EscapeQueryParamValue(passport, false);
   }
 #endif  // defined(OS_CHROMEOS)
 
   if (delay_response) {
-    const int kTimeout = 3;
+    const int kTimeout = 12;
     timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeout),
         this, &WebSocketProxyPrivate::Finalize);
   } else {
     Finalize();
   }
   return true;
 }