diff options
| author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 00:48:58 +0000 |
|---|---|---|
| committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 00:48:58 +0000 |
| commit | 442b86af37a9757f535cc7199a2933f4d30628cd (patch) | |
| tree | 95ccffd3e3f4fe60cb97630c225e7959761b17ae /chrome/browser/chromeos/external_metrics.h | |
| parent | 3bd5173e4c70d227fa5d6d20fdd38cbae85d8f72 (diff) | |
| download | chromium_src-442b86af37a9757f535cc7199a2933f4d30628cd.zip chromium_src-442b86af37a9757f535cc7199a2933f4d30628cd.tar.gz chromium_src-442b86af37a9757f535cc7199a2933f4d30628cd.tar.bz2 | |
Revert 34099 - fix for memory leak and illegal access. (found in valgrind test)
* name, values for callback seems to be on stack.
i changed const char* to string so that it can copy, and
also expect_eq can print string when failed.
BUG=None
TEST=Run unit_tests on valgrind.
Review URL: http://codereview.chromium.org/470006
TBR=oshima@chromium.org
Review URL: http://codereview.chromium.org/466083
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/external_metrics.h')
| -rw-r--r-- | chrome/browser/chromeos/external_metrics.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h index 55774cf..2721939 100644 --- a/chrome/browser/chromeos/external_metrics.h +++ b/chrome/browser/chromeos/external_metrics.h @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "testing/gtest/include/gtest/gtest_prod.h" // For FRIEND_TEST @@ -24,7 +23,6 @@ namespace chromeos { class ExternalMetrics : public base::RefCountedThreadSafe<ExternalMetrics> { FRIEND_TEST(ExternalMetricsTest, ParseExternalMetricsFile); friend class base::RefCountedThreadSafe<ExternalMetrics>; - friend class scoped_ptr<ExternalMetrics>; public: ExternalMetrics() {} |