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"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
 #include "net/base/escape.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
 #endif
 
 WebSocketProxyPrivate::WebSocketProxyPrivate()
-    : is_finalized_(false), listening_port_(-1) {
+    : is_finalized_(false),
+      listening_port_(-1) {

[miket_OOO, 2011/10/24 17:50:46]

Is the indentation change needed?

[Denis Lagno, 2011/10/24 19:47:58]

Done.

+#if defined(OS_CHROMEOS)
+  listening_port_ = chromeos::WebSocketProxyController::GetPort();
+#endif
 }
 
 WebSocketProxyPrivate::~WebSocketProxyPrivate() {
 }
 
 void WebSocketProxyPrivate::Observe(
     int type, const content::NotificationSource& source,
     const content::NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
   DCHECK_EQ(chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED, type);
 #else
   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(
@@ skipping 93 matching lines @@
     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;

[miket_OOO, 2011/10/24 17:50:46]

Will you please add some documentation for this value and why it was changed?
Putting it in the CL description is enough.

[Denis Lagno, 2011/10/24 19:47:58]

Done.

     timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeout),
         this, &WebSocketProxyPrivate::Finalize);
   } else {
     Finalize();
   }
   return true;
 }