Move CFX_Observable to Observable

This CL renames CFX_Observable to Observable and moves into the fxcrt
namespace.

The test suite names were updated to ObservedPtr from fxcrt.

Bug: pdfium:898
Change-Id: Ia507482bc0a1d6d8bbf12c0c55c4a88f6c8910e2
Reviewed-on: https://pdfium-review.googlesource.com/14615
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 0 insertions, 185 deletions

diff --git a/core/fxcrt/cfx_observable_unittest.cpp b/core/fxcrt/cfx_observable_unittest.cpp
deleted file mode 100644
index f7c78c1112..0000000000
--- a/core/fxcrt/cfx_observable_unittest.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2016 PDFium 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 "core/fxcrt/cfx_observable.h"
-
-#include <utility>
-#include <vector>
-
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-class PseudoObservable : public CFX_Observable<PseudoObservable> {
- public:
-  PseudoObservable() {}
-  int SomeMethod() { return 42; }
-  size_t ActiveObservedPtrs() const { return ActiveObservedPtrsForTesting(); }
-};
-
-}  // namespace
-
-TEST(fxcrt, ObservePtrNull) {
-  PseudoObservable::ObservedPtr ptr;
-  EXPECT_EQ(nullptr, ptr.Get());
-}
-
-TEST(fxcrt, ObservePtrLivesLonger) {
-  PseudoObservable* pObs = new PseudoObservable;
-  PseudoObservable::ObservedPtr ptr(pObs);
-  EXPECT_NE(nullptr, ptr.Get());
-  EXPECT_EQ(1u, pObs->ActiveObservedPtrs());
-  delete pObs;
-  EXPECT_EQ(nullptr, ptr.Get());
-}
-
-TEST(fxcrt, ObservePtrLivesShorter) {
-  PseudoObservable obs;
-  {
-    PseudoObservable::ObservedPtr ptr(&obs);
-    EXPECT_NE(nullptr, ptr.Get());
-    EXPECT_EQ(1u, obs.ActiveObservedPtrs());
-  }
-  EXPECT_EQ(0u, obs.ActiveObservedPtrs());
-}
-
-TEST(fxcrt, ObserveCopyConstruct) {
-  PseudoObservable obs;
-  {
-    PseudoObservable::ObservedPtr ptr(&obs);
-    EXPECT_NE(nullptr, ptr.Get());
-    EXPECT_EQ(1u, obs.ActiveObservedPtrs());
-    {
-      PseudoObservable::ObservedPtr ptr2(ptr);
-      EXPECT_NE(nullptr, ptr2.Get());
-      EXPECT_EQ(2u, obs.ActiveObservedPtrs());
-    }
-    EXPECT_EQ(1u, obs.ActiveObservedPtrs());
-  }
-  EXPECT_EQ(0u, obs.ActiveObservedPtrs());
-}
-
-TEST(fxcrt, ObserveCopyAssign) {
-  PseudoObservable obs;
-  {
-    PseudoObservable::ObservedPtr ptr(&obs);
-    EXPECT_NE(nullptr, ptr.Get());
-    EXPECT_EQ(1u, obs.ActiveObservedPtrs());
-    {
-      PseudoObservable::ObservedPtr ptr2;
-      ptr2 = ptr;
-      EXPECT_NE(nullptr, ptr2.Get());
-      EXPECT_EQ(2u, obs.ActiveObservedPtrs());
-    }
-    EXPECT_EQ(1u, obs.ActiveObservedPtrs());
-  }
-  EXPECT_EQ(0u, obs.ActiveObservedPtrs());
-}
-
-TEST(fxcrt, ObserveVector) {
-  PseudoObservable obs;
-  {
-    std::vector<PseudoObservable::ObservedPtr> vec1;
-    std::vector<PseudoObservable::ObservedPtr> vec2;
-    vec1.emplace_back(&obs);
-    vec1.emplace_back(&obs);
-    EXPECT_NE(nullptr, vec1[0].Get());
-    EXPECT_NE(nullptr, vec1[1].Get());
-    EXPECT_EQ(2u, obs.ActiveObservedPtrs());
-    vec2 = vec1;
-    EXPECT_NE(nullptr, vec2[0].Get());
-    EXPECT_NE(nullptr, vec2[1].Get());
-    EXPECT_EQ(4u, obs.ActiveObservedPtrs());
-    vec1.clear();
-    EXPECT_EQ(2u, obs.ActiveObservedPtrs());
-    vec2.resize(10000);
-    EXPECT_EQ(2u, obs.ActiveObservedPtrs());
-    vec2.resize(0);
-    EXPECT_EQ(0u, obs.ActiveObservedPtrs());
-  }
-  EXPECT_EQ(0u, obs.ActiveObservedPtrs());
-}
-
-TEST(fxcrt, ObserveVectorAutoClear) {
-  std::vector<PseudoObservable::ObservedPtr> vec1;
-  {
-    PseudoObservable obs;
-    vec1.emplace_back(&obs);
-    vec1.emplace_back(&obs);
-    EXPECT_NE(nullptr, vec1[0].Get());
-    EXPECT_NE(nullptr, vec1[1].Get());
-    EXPECT_EQ(2u, obs.ActiveObservedPtrs());
-  }
-  EXPECT_EQ(nullptr, vec1[0].Get());
-  EXPECT_EQ(nullptr, vec1[1].Get());
-}
-
-TEST(fxcrt, ObservePtrResetNull) {
-  PseudoObservable obs;
-  PseudoObservable::ObservedPtr ptr(&obs);
-  EXPECT_EQ(1u, obs.ActiveObservedPtrs());
-  ptr.Reset();
-  EXPECT_EQ(0u, obs.ActiveObservedPtrs());
-}
-
-TEST(fxcrt, ObservePtrReset) {
-  PseudoObservable obs1;
-  PseudoObservable obs2;
-  PseudoObservable::ObservedPtr ptr(&obs1);
-  EXPECT_EQ(1u, obs1.ActiveObservedPtrs());
-  EXPECT_EQ(0u, obs2.ActiveObservedPtrs());
-  ptr.Reset(&obs2);
-  EXPECT_EQ(0u, obs1.ActiveObservedPtrs());
-  EXPECT_EQ(1u, obs2.ActiveObservedPtrs());
-}
-
-TEST(fxcrt, ObservePtrEquals) {
-  PseudoObservable obj1;
-  PseudoObservable obj2;
-  PseudoObservable::ObservedPtr null_ptr1;
-  PseudoObservable::ObservedPtr obj1_ptr1(&obj1);
-  PseudoObservable::ObservedPtr obj2_ptr1(&obj2);
-  {
-    PseudoObservable::ObservedPtr null_ptr2;
-    EXPECT_TRUE(null_ptr1 == null_ptr2);
-
-    PseudoObservable::ObservedPtr obj1_ptr2(&obj1);
-    EXPECT_TRUE(obj1_ptr1 == obj1_ptr2);
-
-    PseudoObservable::ObservedPtr obj2_ptr2(&obj2);
-    EXPECT_TRUE(obj2_ptr1 == obj2_ptr2);
-  }
-  EXPECT_FALSE(null_ptr1 == obj1_ptr1);
-  EXPECT_FALSE(null_ptr1 == obj2_ptr1);
-  EXPECT_FALSE(obj1_ptr1 == obj2_ptr1);
-}
-
-TEST(fxcrt, ObservePtrNotEquals) {
-  PseudoObservable obj1;
-  PseudoObservable obj2;
-  PseudoObservable::ObservedPtr null_ptr1;
-  PseudoObservable::ObservedPtr obj1_ptr1(&obj1);
-  PseudoObservable::ObservedPtr obj2_ptr1(&obj2);
-  {
-    PseudoObservable::ObservedPtr null_ptr2;
-    PseudoObservable::ObservedPtr obj1_ptr2(&obj1);
-    PseudoObservable::ObservedPtr obj2_ptr2(&obj2);
-    EXPECT_FALSE(null_ptr1 != null_ptr2);
-    EXPECT_FALSE(obj1_ptr1 != obj1_ptr2);
-    EXPECT_FALSE(obj2_ptr1 != obj2_ptr2);
-  }
-  EXPECT_TRUE(null_ptr1 != obj1_ptr1);
-  EXPECT_TRUE(null_ptr1 != obj2_ptr1);
-  EXPECT_TRUE(obj1_ptr1 != obj2_ptr1);
-}
-
-TEST(fxcrt, ObservePtrBool) {
-  PseudoObservable obj1;
-  PseudoObservable::ObservedPtr null_ptr;
-  PseudoObservable::ObservedPtr obj1_ptr(&obj1);
-  bool null_bool = !!null_ptr;
-  bool obj1_bool = !!obj1_ptr;
-  EXPECT_FALSE(null_bool);
-  EXPECT_TRUE(obj1_bool);
-}