Remove Chrome Frame's delay shutdown field trial.

chrome_frame/chrome_frame_automation.cc

Index: chrome_frame/chrome_frame_automation.cc
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 633a1ae2ca4dce8cfdf4d3223ceda6d067773c61..3247343d881b339825a4a16996e6b256887cff65 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -14,7 +14,6 @@
 #include "base/file_version_info.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
@@ -43,10 +42,6 @@ int64 kAutomationServerReasonableLaunchDelay = 1000;  // in milliseconds
 int64 kAutomationServerReasonableLaunchDelay = 1000 * 10;
 #endif
 
-const char kChromeShutdownDelaySeconds[] = "30";
-const char kWithDelayFieldTrialName[] = "WithShutdownDelay";
-const char kNoDelayFieldTrialName[] = "NoShutdownDelay";
-
 }  // namespace
 
 class ChromeFrameAutomationProxyImpl::TabProxyNotificationMessageFilter
@@ -302,10 +297,6 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params,
     if (IsAccessibleMode())
       command_line->AppendSwitch(switches::kForceRendererAccessibility);
 
-    if (params->send_shutdown_delay_switch())
-      command_line->AppendSwitchASCII(switches::kChromeFrameShutdownDelay,
-                                      kChromeShutdownDelaySeconds);
-
     DVLOG(1) << "Profile path: " << params->profile_path().value();
     command_line->AppendSwitchPath(switches::kUserDataDir,
                                    params->profile_path());
@@ -350,19 +341,9 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params,
     if (launch_result_ == AUTOMATION_SUCCESS) {
       UMA_HISTOGRAM_TIMES(
           "ChromeFrame.AutomationServerLaunchSuccessTime", delta);
-      UMA_HISTOGRAM_TIMES(
-          base::FieldTrial::MakeName(
-              "ChromeFrame.AutomationServerLaunchSuccessTime",
-              "ChromeShutdownDelay"),
-          delta);
     } else {
       UMA_HISTOGRAM_TIMES(
           "ChromeFrame.AutomationServerLaunchFailedTime", delta);
-      UMA_HISTOGRAM_TIMES(
-          base::FieldTrial::MakeName(
-              "ChromeFrame.AutomationServerLaunchFailedTime",
-              "ChromeShutdownDelay"),
-          delta);
     }
 
     UMA_HISTOGRAM_CUSTOM_COUNTS("ChromeFrame.LaunchResult",
@@ -557,9 +538,7 @@ ChromeFrameAutomationClient::ChromeFrameAutomationClient()
       url_fetcher_(NULL),
       url_fetcher_flags_(PluginUrlRequestManager::NOT_THREADSAFE),
       navigate_after_initialization_(false),
-      route_all_top_level_navigations_(false),
-      send_shutdown_delay_switch_(true) {
-  InitializeFieldTrials();
+      route_all_top_level_navigations_(false) {
 }
 
 ChromeFrameAutomationClient::~ChromeFrameAutomationClient() {
@@ -698,8 +677,7 @@ bool ChromeFrameAutomationClient::InitiateNavigation(
       base::FilePath profile_path;
       chrome_launch_params_ = new ChromeFrameLaunchParams(parsed_url,
           referrer_gurl, profile_path, L"", SimpleResourceLoader::GetLanguage(),
-          false, false, route_all_top_level_navigations_,
-          send_shutdown_delay_switch_);
+          false, false, route_all_top_level_navigations_);
     } else {
       chrome_launch_params_->set_referrer(referrer_gurl);
       chrome_launch_params_->set_url(parsed_url);
@@ -1037,33 +1015,6 @@ bool ChromeFrameAutomationClient::ProcessUrlRequestMessage(TabProxy* tab,
   return true;
 }
 
-void ChromeFrameAutomationClient::InitializeFieldTrials() {
-  static base::FieldTrial* trial = NULL;
-  if (!trial) {
-    // Do one-time initialization of the field trial here.
-    // TODO(robertshield): End the field trial before March 7th 2013.
-    scoped_refptr<base::FieldTrial> new_trial =
-        base::FieldTrialList::FactoryGetFieldTrial(
-            "ChromeShutdownDelay", 1000, kWithDelayFieldTrialName,
-            2013, 3, 7, NULL);
-
-    // Be consistent for this client. Note that this will only have an effect
-    // once the client id is persisted. See http://crbug.com/117188
-    new_trial->UseOneTimeRandomization();
-
-    new_trial->AppendGroup(kNoDelayFieldTrialName, 500);    // 50% without.
-
-    trial = new_trial.get();
-  }
-
-  // Take action depending of which group we randomly land in.
-  if (trial->group_name() == kWithDelayFieldTrialName)
-    send_shutdown_delay_switch_ = true;
-  else
-    send_shutdown_delay_switch_ = false;
-
-}
-
 // These are invoked in channel's background thread.
 // Cannot call any method of the activex here since it is a STA kind of being.
 // By default we marshal the IPC message to the main/GUI thread and from there