2 files changed, 8 insertions, 12 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() {}
diff --git a/chrome/browser/chromeos/external_metrics_unittest.cc b/chrome/browser/chromeos/external_metrics_unittest.cc
index 3e72188..b484736 100644
--- a/chrome/browser/chromeos/external_metrics_unittest.cc
+++ b/chrome/browser/chromeos/external_metrics_unittest.cc
@@ -6,7 +6,6 @@
 #include <sys/file.h>
 
 #include "base/basictypes.h"
-#include "base/scoped_ptr.h"
 #include "chrome/browser/chromeos/external_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -29,19 +28,19 @@ static void SendMessage(const char* path, const char* name, const char* value) {
   close(fd);
 }
 
-static scoped_ptr<std::string> received_name;
-static scoped_ptr<std::string> received_value;
-static int received_count = 0;
+const char* received_name = NULL;
+const char* received_value = NULL;
+int received_count = 0;
 
 static void ReceiveMessage(const char* name, const char* value) {
-  received_name.reset(new std::string(name));
-  received_value.reset(new std::string(value));
+  received_name = name;
+  received_value = value;
   received_count++;
 }
 
 static void CheckMessage(const char* name, const char* value, int count) {
-  EXPECT_EQ(*received_name.get(), name);
-  EXPECT_EQ(*received_value.get(), value);
+  EXPECT_EQ(0, strcmp(received_name, name));
+  EXPECT_EQ(0, strcmp(received_value, value));
   EXPECT_EQ(received_count, count);
 }
 
@@ -58,8 +57,7 @@ TEST(ExternalMetricsTest, ParseExternalMetricsFile) {
   int32 i;
   const char* path = "/tmp/.chromeos-metrics";
 
-  scoped_ptr<chromeos::ExternalMetrics>
-      external_metrics(new chromeos::ExternalMetrics());
+  chromeos::ExternalMetrics* external_metrics = new chromeos::ExternalMetrics();
   external_metrics->SetRecorder(&ReceiveMessage);
 
   EXPECT_TRUE(unlink(path) == 0 || errno == ENOENT);