[UMA] Use proper C++ objects to serialize tracked_objects across process boundaries.

base/location.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 "build/build_config.h"
 
 #if defined(COMPILER_MSVC)
 // MSDN says to #include <intrin.h>, but that breaks the VS2005 build.
 extern "C" {
   void* _ReturnAddress();
 }
 #endif
 
 #include "base/location.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
+#include "base/values.h"
+
+using base::DictionaryValue;
+using base::Value;
 
 namespace tracked_objects {
 
 Location::Location(const char* function_name,
                    const char* file_name,
                    int line_number,
                    const void* program_counter)
     : function_name_(function_name),
       file_name_(file_name),
       line_number_(line_number),
@@ skipping 37 matching lines @@
         output->append("&gt;");
         break;
 
       default:
         output->push_back(*p);
         break;
     }
   }
 }
 
-base::DictionaryValue* Location::ToValue() const {
-  base::DictionaryValue* dictionary = new base::DictionaryValue;
-  dictionary->Set("file_name", base::Value::CreateStringValue(file_name_));
-  // Note: This function name is not escaped, and templates have less than
+//------------------------------------------------------------------------------
+SerializedLocation::SerializedLocation() {
+}
+
+SerializedLocation::SerializedLocation(
+    const tracked_objects::Location& location)
+    : file_name(location.file_name()),
+      function_name(location.function_name()),
+      line_number(location.line_number()) {
+}
+
+SerializedLocation::~SerializedLocation() {
+}
+
+void SerializedLocation::ToValue(DictionaryValue* dictionary) const {
+  dictionary->Set("file_name", Value::CreateStringValue(file_name));
+  // Note: This function name is not escaped, and templates have less-than
   // characters, which means this is not suitable for display as HTML unless
   // properly escaped.
-  dictionary->Set("function_name",
-                  base::Value::CreateStringValue(function_name_));
-  dictionary->Set("line_number", base::Value::CreateIntegerValue(line_number_));
-  return dictionary;
+  dictionary->Set("function_name", Value::CreateStringValue(function_name));
+  dictionary->Set("line_number", Value::CreateIntegerValue(line_number));
 }
 
+//------------------------------------------------------------------------------
 #if defined(COMPILER_MSVC)
 __declspec(noinline)
 #endif
 BASE_EXPORT const void* GetProgramCounter() {
 #if defined(COMPILER_MSVC)
   return _ReturnAddress();
 #elif defined(COMPILER_GCC)
   return __builtin_extract_return_addr(__builtin_return_address(0));
 #endif  // COMPILER_GCC
 
   return NULL;
 }
 
 }  // namespace tracked_objects