Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/memory/scoped_ptr_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 
 #include <sstream>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/strings/stringprintf.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Used to test depth subtyping.
 class ConDecLoggerParent {
  public:
   virtual ~ConDecLoggerParent() {}
 
   virtual void SetPtr(int* ptr) = 0;
@@ skipping 656 matching lines @@
   };
   scoped_ptr<int> owner(new int);
   scoped_ptr<int, NoOpDeleter> x(owner.get());
   x.reset(x.get());
 }
 
 // Logging a scoped_ptr<T> to an ostream shouldn't convert it to a boolean
 // value first.
 TEST(ScopedPtrTest, LoggingDoesntConvertToBoolean) {
   scoped_ptr<int> x(new int);
-  std::stringstream s1;
-  s1 << x;
-
-  std::stringstream s2;
-  s2 << x.get();
-
-  EXPECT_EQ(s2.str(), s1.str());
+  std::stringstream s;
+  s << x;
+  std::string expected = base::StringPrintf("%p", x.get());
+  EXPECT_EQ(expected, s.str());
 }