Merge 32462 - Enable WebSocketExperiment back...

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 847 matching lines @@
     // on recording, but not reporting, otherwise tests fail.
     if (record_only) {
       metrics->StartRecordingOnly();
     } else {
       // If the user permits metrics reporting with the checkbox in the
       // prefs, we turn on recording.
       metrics->SetUserPermitsUpload(enabled);
       if (enabled)
         metrics->Start();
     }
-    // TODO(ukai): Bug 28096: Implement ExperimentRunner so that it does not
-    // tear down histograms early, and cause a crash.
-    /*
     chrome_browser_net_websocket_experiment::WebSocketExperimentRunner::Start();
-    */
   }
 
   InstallJankometer(parsed_command_line);
 
 #if defined(OS_WIN) && !defined(GOOGLE_CHROME_BUILD)
   if (parsed_command_line.HasSwitch(switches::kDebugPrint)) {
     printing::PrintedDocument::set_debug_dump_path(
         parsed_command_line.GetSwitchValue(switches::kDebugPrint));
   }
 #endif
@@ skipping 47 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }