Remove Chrome Frame's delay shutdown field trial.

chrome_frame/chrome_tab.cc

 // Copyright (c) 2012 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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Need to include this before the ATL headers below.
 #include "chrome_frame/chrome_tab.h"
 
 #include <atlsecurity.h>
 #include <objbase.h>
 
 #include "base/at_exit.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
-#include "base/metrics/field_trial.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/metrics/entropy_provider.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/chrome_active_document.h"
 #include "chrome_frame/chrome_frame_activex.h"
 #include "chrome_frame/chrome_frame_automation.h"
 #include "chrome_frame/chrome_frame_reporting.h"
 #include "chrome_frame/chrome_launcher_utils.h"
 #include "chrome_frame/chrome_protocol.h"
 #include "chrome_frame/dll_redirector.h"
 #include "chrome_frame/exception_barrier.h"
-#include "chrome_frame/metrics_service.h"
 #include "chrome_frame/pin_module.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/utils.h"
 #include "googleurl/src/url_util.h"
 #include "grit/chrome_frame_resources.h"
 
 using base::win::RegKey;
 
 namespace {
 
@@ skipping 172 matching lines @@
   // A scoper created when the module is initially locked and destroyed when it
   // is finally unlocked. This is not a scoped_ptr since that could cause
   // reporting to shut down at exit, which would lead to problems with the
   // loader lock.
   chrome_frame::ScopedCrashReporting* crash_reporting_;
 };
 
 ChromeTabModule _AtlModule;
 
 base::AtExitManager* g_exit_manager = NULL;
-base::FieldTrialList* g_field_trial_list = NULL;
 
 HRESULT RefreshElevationPolicy() {
   const wchar_t kIEFrameDll[] = L"ieframe.dll";
   const char kIERefreshPolicy[] = "IERefreshElevationPolicy";
   HRESULT hr = E_NOTIMPL;
 
   // Stick an SEH in the chain to prevent the VEH from picking up on first
   // chance exceptions caused by loading ieframe.dll. Use the vanilla
   // ExceptionBarrier to report any exceptions that do make their way to us
   // though.
@@ skipping 645 matching lines @@
       // DllGetClassObject export:
       g_dll_get_class_object_redir_ptr =
           dll_redirector->GetDllGetClassObjectPtr();
       DCHECK(g_dll_get_class_object_redir_ptr != NULL)
           << "Found CF module with no DllGetClassObject export.";
     }
 
     // Enable trace control and transport through event tracing for Windows.
     logging::LogEventProvider::Initialize(kChromeFrameProvider);
 
-    // Initialize the field test infrastructure. Must be done somewhere that
-    // can only get called once. For Chrome Frame, that is here.
-    g_field_trial_list = new base::FieldTrialList(
-        new metrics::SHA1EntropyProvider(MetricsService::GetClientID()));
-
     // Set a callback so that crash reporting can be pinned when the module is
     // pinned.
     chrome_frame::SetPinModuleCallback(&OnPinModule);
   } else if (reason == DLL_PROCESS_DETACH) {
-    delete g_field_trial_list;
-    g_field_trial_list = NULL;
-
     DllRedirector* dll_redirector = DllRedirector::GetInstance();
     DCHECK(dll_redirector);
     dll_redirector->UnregisterAsFirstCFModule();
 
     g_patch_helper.UnpatchIfNeeded();
 
     delete g_exit_manager;
     g_exit_manager = NULL;
   }
   return _AtlModule.DllMain(reason, reserved);
@@ skipping 64 matching lines @@
   HRESULT hr = CustomRegistration(ALL, FALSE, false);
   return hr;
 }
 
 // Object entries go here instead of with each object, so that we can move
 // the objects to a lib. Also reduces magic.
 OBJECT_ENTRY_AUTO(CLSID_ChromeFrameBHO, Bho)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeActiveDocument), ChromeActiveDocument)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeFrame), ChromeFrameActivex)
 OBJECT_ENTRY_AUTO(__uuidof(ChromeProtocol), ChromeProtocol)