| Index: base/debug_util_posix.cc
|
| ===================================================================
|
| --- base/debug_util_posix.cc (revision 56291)
|
| +++ base/debug_util_posix.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2010 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.
|
|
|
| @@ -13,6 +13,9 @@
|
| #include <sys/types.h>
|
| #include <unistd.h>
|
|
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| #if defined(__GLIBCXX__)
|
| #include <cxxabi.h>
|
| #endif
|
| @@ -31,7 +34,7 @@
|
| #include "base/safe_strerror_posix.h"
|
| #include "base/scoped_ptr.h"
|
| #include "base/string_piece.h"
|
| -#include "base/string_util.h"
|
| +#include "base/stringprintf.h"
|
|
|
| #if defined(USE_SYMBOLIZE)
|
| #include "base/third_party/symbolize/symbolize.h"
|
| @@ -109,10 +112,11 @@
|
| symbol, sizeof(symbol))) {
|
| // Don't call DemangleSymbols() here as the symbol is demangled by
|
| // google::Symbolize().
|
| - trace_strings->push_back(StringPrintf("%s [%p]", symbol, trace[i]));
|
| + trace_strings->push_back(
|
| + base::StringPrintf("%s [%p]", symbol, trace[i]));
|
| symbolized = true;
|
| } else {
|
| - trace_strings->push_back(StringPrintf("%p", trace[i]));
|
| + trace_strings->push_back(base::StringPrintf("%p", trace[i]));
|
| }
|
| }
|
| #else
|
| @@ -126,7 +130,7 @@
|
| symbolized = true;
|
| } else {
|
| for (int i = 0; i < size; ++i) {
|
| - trace_strings->push_back(StringPrintf("%p", trace[i]));
|
| + trace_strings->push_back(base::StringPrintf("%p", trace[i]));
|
| }
|
| }
|
| #endif // defined(USE_SYMBOLIZE)
|
|
|