| Index: third_party/libaddressinput/chromium/cpp/test/util/scoped_ptr_unittest.cc
 | 
| diff --git a/third_party/libaddressinput/chromium/cpp/test/util/scoped_ptr_unittest.cc b/third_party/libaddressinput/chromium/cpp/test/util/scoped_ptr_unittest.cc
 | 
| deleted file mode 100644
 | 
| index 463a0a867e506088b459f8fc65d9a4f82b81ea3b..0000000000000000000000000000000000000000
 | 
| --- a/third_party/libaddressinput/chromium/cpp/test/util/scoped_ptr_unittest.cc
 | 
| +++ /dev/null
 | 
| @@ -1,114 +0,0 @@
 | 
| -// Copyright 2013 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.
 | 
| -//
 | 
| -// The original source code is from:
 | 
| -// http://src.chromium.org/viewvc/chrome/trunk/src/base/memory/scoped_ptr_unittest.cc?revision=79524
 | 
| -
 | 
| -#include <libaddressinput/util/scoped_ptr.h>
 | 
| -
 | 
| -#include <libaddressinput/util/basictypes.h>
 | 
| -
 | 
| -#include <gtest/gtest.h>
 | 
| -
 | 
| -namespace {
 | 
| -
 | 
| -class ConDecLogger {
 | 
| - public:
 | 
| -  ConDecLogger() : ptr_(NULL) { }
 | 
| -  explicit ConDecLogger(int* ptr) { set_ptr(ptr); }
 | 
| -  ~ConDecLogger() { --*ptr_; }
 | 
| -
 | 
| -  void set_ptr(int* ptr) { ptr_ = ptr; ++*ptr_; }
 | 
| -
 | 
| -  int SomeMeth(int x) { return x; }
 | 
| -
 | 
| - private:
 | 
| -  int* ptr_;
 | 
| -  DISALLOW_COPY_AND_ASSIGN(ConDecLogger);
 | 
| -};
 | 
| -
 | 
| -
 | 
| -void TakePointer(scoped_ptr<ConDecLogger> pointer) {}
 | 
| -
 | 
| -TEST(ScopedPtrTest, ScopedPtr) {
 | 
| -  int constructed = 0;
 | 
| -
 | 
| -  {
 | 
| -    scoped_ptr<ConDecLogger> scoper(new ConDecLogger(&constructed));
 | 
| -    EXPECT_EQ(1, constructed);
 | 
| -    EXPECT_TRUE(scoper);
 | 
| -    EXPECT_TRUE(scoper.get());
 | 
| -
 | 
| -    EXPECT_EQ(10, scoper->SomeMeth(10));
 | 
| -    EXPECT_EQ(10, scoper.get()->SomeMeth(10));
 | 
| -    EXPECT_EQ(10, (*scoper).SomeMeth(10));
 | 
| -  }
 | 
| -  EXPECT_EQ(0, constructed);
 | 
| -
 | 
| -  // Test reset() and release()
 | 
| -  {
 | 
| -    scoped_ptr<ConDecLogger> scoper(new ConDecLogger(&constructed));
 | 
| -    EXPECT_EQ(1, constructed);
 | 
| -    EXPECT_TRUE(scoper);
 | 
| -
 | 
| -    scoper.reset(new ConDecLogger(&constructed));
 | 
| -    EXPECT_EQ(1, constructed);
 | 
| -    EXPECT_TRUE(scoper);
 | 
| -
 | 
| -    scoper.reset();
 | 
| -    EXPECT_EQ(0, constructed);
 | 
| -    EXPECT_FALSE(scoper);
 | 
| -
 | 
| -    scoper.reset(new ConDecLogger(&constructed));
 | 
| -    EXPECT_EQ(1, constructed);
 | 
| -    EXPECT_TRUE(scoper);
 | 
| -
 | 
| -    ConDecLogger* take = scoper.release();
 | 
| -    EXPECT_EQ(1, constructed);
 | 
| -    EXPECT_FALSE(scoper);
 | 
| -    delete take;
 | 
| -    EXPECT_EQ(0, constructed);
 | 
| -
 | 
| -    scoper.reset(new ConDecLogger(&constructed));
 | 
| -    EXPECT_EQ(1, constructed);
 | 
| -    EXPECT_TRUE(scoper);
 | 
| -  }
 | 
| -  EXPECT_EQ(0, constructed);
 | 
| -
 | 
| -  // Test swap(), == and !=
 | 
| -  {
 | 
| -    scoped_ptr<ConDecLogger> scoper1;
 | 
| -    scoped_ptr<ConDecLogger> scoper2;
 | 
| -    EXPECT_TRUE(scoper1 == scoper2.get());
 | 
| -    EXPECT_FALSE(scoper1 != scoper2.get());
 | 
| -
 | 
| -    ConDecLogger* logger = new ConDecLogger(&constructed);
 | 
| -    scoper1.reset(logger);
 | 
| -    EXPECT_EQ(logger, scoper1.get());
 | 
| -    EXPECT_FALSE(scoper2.get());
 | 
| -    EXPECT_FALSE(scoper1 == scoper2.get());
 | 
| -    EXPECT_TRUE(scoper1 != scoper2.get());
 | 
| -
 | 
| -    scoper2.swap(scoper1);
 | 
| -    EXPECT_EQ(logger, scoper2.get());
 | 
| -    EXPECT_FALSE(scoper1.get());
 | 
| -    EXPECT_FALSE(scoper1 == scoper2.get());
 | 
| -    EXPECT_TRUE(scoper1 != scoper2.get());
 | 
| -  }
 | 
| -  EXPECT_EQ(0, constructed);
 | 
| -
 | 
| -  // Test Pass().
 | 
| -  {
 | 
| -    scoped_ptr<ConDecLogger> scoper(new ConDecLogger(&constructed));
 | 
| -    EXPECT_EQ(1, constructed);
 | 
| -    TakePointer(scoper.Pass());
 | 
| -    EXPECT_EQ(0, constructed);
 | 
| -    EXPECT_FALSE(scoper);
 | 
| -
 | 
| -    TakePointer(make_scoped_ptr(new ConDecLogger(&constructed)));
 | 
| -  }
 | 
| -  EXPECT_EQ(0, constructed);
 | 
| -}
 | 
| -
 | 
| -}  // namespace
 | 
| 
 |