Added support to trace_event for passing static string arguments without copy

base/debug/trace_event.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 "base/debug/trace_event.h"
 
 #include <algorithm>
 
 #if defined(OS_WIN)
 #include "base/debug/trace_event_win.h"
@@ skipping 65 matching lines @@
       *out += temp_string;
       break;
     case TRACE_TYPE_POINTER:
       base::snprintf(temp_string, arraysize(temp_string), "%llu",
                      static_cast<unsigned long long>(
                        reinterpret_cast<intptr_t>(
                          as_pointer())));
       *out += temp_string;
       break;
     case TRACE_TYPE_STRING:
+    case TRACE_TYPE_STATIC_STRING:
       *out += "\"";
       start_pos = out->size();
-      *out += as_string();
+      *out += as_string()? as_string() : "NULL";
       // replace " character with '
       while ((start_pos = out->find_first_of('\"', start_pos)) !=
              std::string::npos)
         (*out)[start_pos] = '\'';
       *out += "\"";
       break;
     default:
       NOTREACHED() << "Don't know how to print this value";
       break;
   }
@@ skipping 334 matching lines @@
       buffer_full_callback_copy = buffer_full_callback_;
     }
   } // release lock
 
   if (!buffer_full_callback_copy.is_null())
     buffer_full_callback_copy.Run();
 
   return ret_begin_id;
 }
 
-void TraceLog::AddTraceEventEtw(TraceEventPhase phase,
-                                const char* name,
-                                const void* id,
-                                const char* extra) {
-  // Legacy trace points on windows called to ETW
-#if defined(OS_WIN)
-  TraceEventETWProvider::Trace(name, phase, id, extra);
-#endif
-
-  // Also add new trace event behavior
-  static const TraceCategory* category = GetCategory("ETW Trace Event");
-  if (category->enabled) {
-    TraceLog* tracelog = TraceLog::GetInstance();
-    if (!tracelog)
-      return;
-    tracelog->AddTraceEvent(phase, category, name,
-                            "id", id,
-                            "extra", extra ? extra : "",
-                            -1, 0, false);
-  }
-}
-
 void TraceLog::AddCurrentMetadataEvents() {
   lock_.AssertAcquired();
   for(base::hash_map<PlatformThreadId, std::string>::iterator it =
           thread_names_.begin();
       it != thread_names_.end();
       it++) {
     if (!it->second.empty())
       logged_events_.push_back(
           TraceEvent(static_cast<unsigned long>(base::GetCurrentProcId()),
                      it->first,
                      TimeTicks(), base::debug::TRACE_EVENT_PHASE_METADATA,
                      g_category_metadata, "thread_name",
-                     "name", it->second.c_str(),
+                     "name", it->second,
                      NULL, 0,
                      false));
   }
 }
 
 void TraceLog::Resurrect() {
   StaticMemorySingletonTraits<TraceLog>::Resurrect();
 }
 
 namespace internal {
@@ skipping 37 matching lines @@
         p_data_->name,
         NULL, 0, NULL, 0,
         p_data_->threshold_begin_id, p_data_->threshold, false);
   }
 }
 
 } // namespace internal
 
 }  // namespace debug
 }  // namespace base