Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Unified Diff: chrome_frame/chrome_tab.cc

Issue 14030003: Remove Chrome Frame's delay shutdown field trial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove additional cruft. Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome_frame/chrome_tab.cc
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index d686b64562ef383ec8e3947c1fa0fc8641262e95..478b301c803c42a6d1385ba5f84d961fac7423c1 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -17,7 +17,6 @@
#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"
@@ -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 @@ class ChromeTabModule : public CAtlDllModuleT<ChromeTabModule> {
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 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance,
// 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();

Powered by Google App Engine
This is Rietveld 408576698