Remove temporary code after migration of Platform::updateTraceEventDuration

base/debug/trace_event_impl.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.
 
 #include "base/debug/trace_event_impl.h"
 
 #include <algorithm>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 1915 matching lines @@
   TraceEventETWProvider::Trace(name, phase, id, extra);
 #endif
   INTERNAL_TRACE_EVENT_ADD(phase, "ETW Trace Event", name,
                            TRACE_EVENT_FLAG_COPY, "id", id, "extra", extra);
 }
 
 void TraceLog::UpdateTraceEventDuration(
     const unsigned char* category_group_enabled,
     const char* name,
     TraceEventHandle handle) {
-  OptionalAutoLock lock(lock_);
+  TimeTicks now = OffsetNow();
 
-  TimeTicks now = OffsetNow();
-  TraceEvent* trace_event = NULL;
-  // TODO(wangxianzhu): Remove the !category_group_enabled condition after
-  // all clients migrate to the new UpdateTraceEventDuration API.
-  if (!category_group_enabled ||
-      (*category_group_enabled & ENABLED_FOR_RECORDING)) {
-    trace_event = GetEventByHandleInternal(handle, &lock);
+  if (*category_group_enabled & ENABLED_FOR_RECORDING) {
+    OptionalAutoLock lock(lock_);
+
+    TraceEvent* trace_event = GetEventByHandleInternal(handle, &lock);
     if (trace_event) {
       DCHECK(trace_event->phase() == TRACE_EVENT_PHASE_COMPLETE);
       trace_event->UpdateDuration(now);
 #if defined(OS_ANDROID)
       trace_event->SendToATrace();
 #endif
     }
 
     if (trace_options() & ECHO_TO_CONSOLE) {
       lock.EnsureAcquired();
       OutputEventToConsoleWhileLocked(TRACE_EVENT_PHASE_END, now, trace_event);
     }
   }
 
-  // TODO(wangxianzhu): Remove this block after all clients migrate to the
-  // new UpdateTraceEventDuration API.
-  if (!category_group_enabled || !name) {
-    if (!trace_event)
-      return;
-    category_group_enabled = trace_event->category_group_enabled();
-    name = trace_event->name();
-  }
-
-  lock.EnsureReleased();
   if (*category_group_enabled & ENABLED_FOR_EVENT_CALLBACK) {
     EventCallback event_callback = reinterpret_cast<EventCallback>(
         subtle::NoBarrier_Load(&event_callback_));
     event_callback(now, TRACE_EVENT_PHASE_END, category_group_enabled, name,
                    trace_event_internal::kNoEventId, 0, NULL, NULL, NULL,
                    TRACE_EVENT_FLAG_NONE);
   }
 }
 
 void TraceLog::SetWatchEvent(const std::string& category_name,
@@ skipping 349 matching lines @@
 }
 
 ScopedTraceBinaryEfficient::~ScopedTraceBinaryEfficient() {
   if (*category_group_enabled_) {
     TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(category_group_enabled_,
                                                 name_, event_handle_);
   }
 }
 
 }  // namespace trace_event_internal