Add --enable-websocket-over-spdy command-line flag

chrome/browser/browser_main.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/browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 90 matching lines @@
 #include "net/base/network_change_notifier.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_stream_factory.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/socket/tcp_client_socket.h"
 #include "net/spdy/spdy_session.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_throttler_manager.h"
+#include "net/websockets/websocket_job.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 #if defined(USE_LINUX_BREAKPAD)
 #include "base/linux_util.h"
 #include "chrome/app/breakpad_linux.h"
 #endif
 
@@ skipping 1256 matching lines @@
         (parsed_command_line.HasSwitch(switches::kApp) ||
          parsed_command_line.HasSwitch(switches::kAppId) ||
          parsed_command_line.HasSwitch(switches::kNoFirstRun)))
       first_run_ui_bypass = true;
   }
 
   // TODO(viettrungluu): why don't we run this earlier?
   if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs))
     WarnAboutMinimumSystemRequirements();
 
   InitializeNetworkOptions(parsed_command_line);

[Yuta Kitamura, 2011/05/20 08:30:33]

Can't you move this to somewhere below about_flags::ConvertFlagsToSwitches()?
Or, can't you move ConvertFlagsToSwitches() to somewhere above here?

[Takashi Toyoshima, 2011/05/20 09:46:52]

It could be possible to move ConvertFlagsToSwitch() before
InitializeNetworkOptions().
But it should be splited into another Issue & change.
There might be another discussion around that.

For the time being, my flag doesn't use about:flags mechanism.
I move my flag check into InitializeNetworkOptions.

 
   // Initialize histogram synchronizer system. This is a singleton and is used
   // for posting tasks via NewRunnableMethod. Its deleted when it goes out of
   // scope. Even though NewRunnableMethod does AddRef and Release, the object
   // will not be deleted after the Task is executed.
   scoped_refptr<HistogramSynchronizer> histogram_synchronizer(
       new HistogramSynchronizer());
 
   // Initialize thread watcher system. This is a singleton and is used by
   // WatchDogThread to keep track of information about threads that are being
   // watched.
   scoped_ptr<ThreadWatcherList> thread_watcher_list(new ThreadWatcherList());
 
   // Convert active labs into switches. Modifies the current command line.
   about_flags::ConvertFlagsToSwitches(local_state,
                                       CommandLine::ForCurrentProcess());
 
+  // Enable WebSocket over SPDY.
+  // It shluld be set up in InitializeNetworkOptions, but we could not handle

[Yuta Kitamura, 2011/05/20 08:30:33]

shluld -> should

[Takashi Toyoshima, 2011/05/20 09:46:52]

This comment is changed for former relocation.

+  // about:flags there. So We set it up here for the future labs switch.

[Yuta Kitamura, 2011/05/20 08:30:33]

We -> we

[Takashi Toyoshima, 2011/05/20 09:46:52]

ditto.

+  if (parsed_command_line.HasSwitch(switches::kEnableWebSocketOverSpdy))
+    net::WebSocketJob::set_websocket_over_spdy_enabled(true);
+
   // Now the command line has been mutated based on about:flags, we can
   // set up metrics and initialize field trials.
   MetricsService* metrics = parts->SetupMetricsAndFieldTrials(
       parsed_command_line, local_state);
 
   // Now that all preferences have been registered, set the install date
   // for the uninstall metrics if this is our first run. This only actually
   // gets used if the user has metrics reporting enabled at uninstall time.
   int64 install_date =
       local_state->GetInt64(prefs::kUninstallMetricsInstallDate);
@@ skipping 534 matching lines @@
 #if defined(OS_CHROMEOS)
   // To be precise, logout (browser shutdown) is not yet done, but the
   // remaining work is negligible, hence we say LogoutDone here.
   chromeos::BootTimesLoader::Get()->AddLogoutTimeMarker("LogoutDone",
                                                         false);
   chromeos::BootTimesLoader::Get()->WriteLogoutTimes();
 #endif
   TRACE_EVENT_END_ETW("BrowserMain", 0, 0);
   return result_code;
 }