Merge gpu_trace_event back into base/debug/trace_event

chrome/app/client_util.cc

 // Copyright (c) 2011 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.
 
 #include <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/environment.h"
@@ skipping 112 matching lines @@
 
     base::win::RegKey key(HKEY_CURRENT_USER, L"Software\\Google\\ChromeFrame",
                           KEY_QUERY_VALUE);
     if (key.Valid()) {
       key.ReadValueDW(L"PreReadSize", &pre_read_size);
       key.ReadValueDW(L"PreReadStepSize", &pre_read_step_size);
       key.ReadValueDW(L"PreRead", &pre_read);
       key.Close();
     }
     if (pre_read) {
-      TRACE_EVENT_BEGIN("PreReadImage", 0, "");
+      TRACE_EVENT_BEGIN_ETW("PreReadImage", 0, "");
       file_util::PreReadImage(dir->c_str(), pre_read_size, pre_read_step_size);
-      TRACE_EVENT_END("PreReadImage", 0, "");
+      TRACE_EVENT_END_ETW("PreReadImage", 0, "");
     }
   }
 #endif  // NDEBUG
 
   return ::LoadLibraryExW(dir->c_str(), NULL,
                           LOAD_WITH_ALTERED_SEARCH_PATH);
 }
 
 // Set did_run "dr" to |value| in Google Update's client state key for the
 // product associated with |dist|, creating the client state key if necessary.
@@ skipping 197 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }