2 files changed, 31 insertions, 25 deletions
diff --git a/core/fxcrt/cfx_shared_copy_on_write.h b/core/fxcrt/shared_copy_on_write.h
index f897368813..c04730d5e0 100644
--- a/core/fxcrt/cfx_shared_copy_on_write.h
+++ b/core/fxcrt/shared_copy_on_write.h
@@ -4,21 +4,23 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCRT_CFX_SHARED_COPY_ON_WRITE_H_
-#define CORE_FXCRT_CFX_SHARED_COPY_ON_WRITE_H_
+#ifndef CORE_FXCRT_SHARED_COPY_ON_WRITE_H_
+#define CORE_FXCRT_SHARED_COPY_ON_WRITE_H_
 
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/retain_ptr.h"
 
+namespace fxcrt {
+
 // A shared object with Copy on Write semantics that makes it appear as
 // if each one were independent.
 template <class ObjClass>
-class CFX_SharedCopyOnWrite {
+class SharedCopyOnWrite {
  public:
-  CFX_SharedCopyOnWrite() {}
-  CFX_SharedCopyOnWrite(const CFX_SharedCopyOnWrite& other)
+  SharedCopyOnWrite() {}
+  SharedCopyOnWrite(const SharedCopyOnWrite& other)
       : m_pObject(other.m_pObject) {}
-  ~CFX_SharedCopyOnWrite() {}
+  ~SharedCopyOnWrite() {}
 
   template <typename... Args>
   ObjClass* Emplace(Args... params) {
@@ -26,7 +28,7 @@ class CFX_SharedCopyOnWrite {
     return m_pObject.Get();
   }
 
-  CFX_SharedCopyOnWrite& operator=(const CFX_SharedCopyOnWrite& that) {
+  SharedCopyOnWrite& operator=(const SharedCopyOnWrite& that) {
     if (*this != that)
       m_pObject = that.m_pObject;
     return *this;
@@ -44,10 +46,10 @@ class CFX_SharedCopyOnWrite {
     return m_pObject.Get();
   }
 
-  bool operator==(const CFX_SharedCopyOnWrite& that) const {
+  bool operator==(const SharedCopyOnWrite& that) const {
     return m_pObject == that.m_pObject;
   }
-  bool operator!=(const CFX_SharedCopyOnWrite& that) const {
+  bool operator!=(const SharedCopyOnWrite& that) const {
     return !(*this == that);
   }
   explicit operator bool() const { return !!m_pObject; }
@@ -82,4 +84,8 @@ class CFX_SharedCopyOnWrite {
   RetainPtr<CountedObj> m_pObject;
 };
 
-#endif  // CORE_FXCRT_CFX_SHARED_COPY_ON_WRITE_H_
+}  // namespace fxcrt
+
+using fxcrt::SharedCopyOnWrite;
+
+#endif  // CORE_FXCRT_SHARED_COPY_ON_WRITE_H_
diff --git a/core/fxcrt/cfx_shared_copy_on_write_unittest.cpp b/core/fxcrt/shared_copy_on_write_unittest.cpp
index 797837465b..a683767054 100644
--- a/core/fxcrt/cfx_shared_copy_on_write_unittest.cpp
+++ b/core/fxcrt/shared_copy_on_write_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcrt/cfx_shared_copy_on_write.h"
+#include "core/fxcrt/shared_copy_on_write.h"
 
 #include <map>
 #include <string>
@@ -45,26 +45,26 @@ class Object {
 
 }  // namespace
 
-TEST(fxcrt, SharedCopyOnWriteNull) {
+TEST(SharedCopyOnWrite, Null) {
   Observer observer;
   {
-    CFX_SharedCopyOnWrite<Object> ptr;
+    SharedCopyOnWrite<Object> ptr;
     EXPECT_EQ(nullptr, ptr.GetObject());
   }
 }
 
-TEST(fxcrt, SharedCopyOnWriteCopy) {
+TEST(SharedCopyOnWrite, Copy) {
   Observer observer;
   {
-    CFX_SharedCopyOnWrite<Object> ptr1;
+    SharedCopyOnWrite<Object> ptr1;
     ptr1.Emplace(&observer, std::string("one"));
     {
-      CFX_SharedCopyOnWrite<Object> ptr2 = ptr1;
+      SharedCopyOnWrite<Object> ptr2 = ptr1;
       EXPECT_EQ(1, observer.GetConstructionCount("one"));
       EXPECT_EQ(0, observer.GetDestructionCount("one"));
     }
     {
-      CFX_SharedCopyOnWrite<Object> ptr3(ptr1);
+      SharedCopyOnWrite<Object> ptr3(ptr1);
       EXPECT_EQ(1, observer.GetConstructionCount("one"));
       EXPECT_EQ(0, observer.GetDestructionCount("one"));
     }
@@ -74,10 +74,10 @@ TEST(fxcrt, SharedCopyOnWriteCopy) {
   EXPECT_EQ(1, observer.GetDestructionCount("one"));
 }
 
-TEST(fxcrt, SharedCopyOnWriteAssignOverOld) {
+TEST(SharedCopyOnWrite, AssignOverOld) {
   Observer observer;
   {
-    CFX_SharedCopyOnWrite<Object> ptr1;
+    SharedCopyOnWrite<Object> ptr1;
     ptr1.Emplace(&observer, std::string("one"));
     ptr1.Emplace(&observer, std::string("two"));
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
@@ -88,12 +88,12 @@ TEST(fxcrt, SharedCopyOnWriteAssignOverOld) {
   EXPECT_EQ(1, observer.GetDestructionCount("two"));
 }
 
-TEST(fxcrt, SharedCopyOnWriteAssignOverRetained) {
+TEST(SharedCopyOnWrite, AssignOverRetained) {
   Observer observer;
   {
-    CFX_SharedCopyOnWrite<Object> ptr1;
+    SharedCopyOnWrite<Object> ptr1;
     ptr1.Emplace(&observer, std::string("one"));
-    CFX_SharedCopyOnWrite<Object> ptr2(ptr1);
+    SharedCopyOnWrite<Object> ptr2(ptr1);
     ptr1.Emplace(&observer, std::string("two"));
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(1, observer.GetConstructionCount("two"));
@@ -104,10 +104,10 @@ TEST(fxcrt, SharedCopyOnWriteAssignOverRetained) {
   EXPECT_EQ(1, observer.GetDestructionCount("two"));
 }
 
-TEST(fxcrt, SharedCopyOnWriteGetModify) {
+TEST(SharedCopyOnWrite, GetModify) {
   Observer observer;
   {
-    CFX_SharedCopyOnWrite<Object> ptr;
+    SharedCopyOnWrite<Object> ptr;
     EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(0, observer.GetDestructionCount("one"));
@@ -116,7 +116,7 @@ TEST(fxcrt, SharedCopyOnWriteGetModify) {
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(0, observer.GetDestructionCount("one"));
     {
-      CFX_SharedCopyOnWrite<Object> other(ptr);
+      SharedCopyOnWrite<Object> other(ptr);
       EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
       EXPECT_EQ(2, observer.GetConstructionCount("one"));
       EXPECT_EQ(0, observer.GetDestructionCount("one"));