Unconditionally send Chrome and Chrome Frame events through ETW machinery.

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>
@@ skipping 10 matching lines @@
 #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/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/env_vars.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"
@@ skipping 807 matching lines @@
     if (!dll_redirector->RegisterAsFirstCFModule()) {
       // Someone else was here first, try and get a pointer to their
       // 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.
-    if (::GetEnvironmentVariable(ASCIIToWide(env_vars::kEtwLogging).c_str(),
-                                 NULL, 0)) {
-      logging::LogEventProvider::Initialize(kChromeFrameProvider);
-    }
+    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(
         MetricsService::GetClientID());
   } else if (reason == DLL_PROCESS_DETACH) {
     delete g_field_trial_list;
     g_field_trial_list = NULL;
 
     DllRedirector* dll_redirector = DllRedirector::GetInstance();
@@ skipping 69 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)