commit c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d
author Torne (Richard Coles) <torne@google.com> Thu May 09 18:35:53 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Mon May 13 13:57:14 2013 +0100
tree 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a
parent 2d519ce2457219605d4f472da8d2ffd469796035

Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f

chrome_frame/chrome_tab.cc

diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index cea60f8..a65c3d7 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -17,13 +17,12 @@
 #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/sys_string_conversions.h"
+#include "base/strings/string_piece.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"
@@ -40,7 +39,6 @@
 #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"
@@ -233,7 +231,6 @@
 ChromeTabModule _AtlModule;
 
 base::AtExitManager* g_exit_manager = NULL;
-base::FieldTrialList* g_field_trial_list = NULL;
 
 HRESULT RefreshElevationPolicy() {
   const wchar_t kIEFrameDll[] = L"ieframe.dll";
@@ -899,18 +896,10 @@
     // 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();