Make CPDF_TextState have a CPDF_TextStateData rather than inheriting one.

core/fxcrt/cfx_count_ref_unittest.cpp

 // 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/include/cfx_count_ref.h"
 
 #include <map>
 #include <string>
 
 #include "testing/fx_string_testhelpers.h"
@@ skipping 40 matching lines @@
   {
     CFX_CountRef<Object> ptr;
     EXPECT_EQ(nullptr, ptr.GetObject());
   }
 }
 
 TEST(fxcrt, CountRefCopy) {
   Observer observer;
   {
     CFX_CountRef<Object> ptr1;
-    ptr1.New(&observer, std::string("one"));
+    ptr1.Emplace(&observer, std::string("one"));
     {
       CFX_CountRef<Object> ptr2 = ptr1;
       EXPECT_EQ(1, observer.GetConstructionCount("one"));
       EXPECT_EQ(0, observer.GetDestructionCount("one"));
     }
     {
       CFX_CountRef<Object> ptr3(ptr1);
       EXPECT_EQ(1, observer.GetConstructionCount("one"));
       EXPECT_EQ(0, observer.GetDestructionCount("one"));
     }
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(0, observer.GetDestructionCount("one"));
   }
   EXPECT_EQ(1, observer.GetDestructionCount("one"));
 }
 
 TEST(fxcrt, CountRefAssignOverOld) {
   Observer observer;
   {
     CFX_CountRef<Object> ptr1;
-    ptr1.New(&observer, std::string("one"));
-    ptr1.New(&observer, std::string("two"));
+    ptr1.Emplace(&observer, std::string("one"));
+    ptr1.Emplace(&observer, std::string("two"));
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(1, observer.GetConstructionCount("two"));
     EXPECT_EQ(1, observer.GetDestructionCount("one"));
     EXPECT_EQ(0, observer.GetDestructionCount("two"));
   }
   EXPECT_EQ(1, observer.GetDestructionCount("two"));
 }
 
 TEST(fxcrt, CountRefAssignOverRetained) {
   Observer observer;
   {
     CFX_CountRef<Object> ptr1;
-    ptr1.New(&observer, std::string("one"));
+    ptr1.Emplace(&observer, std::string("one"));
     CFX_CountRef<Object> ptr2(ptr1);
-    ptr1.New(&observer, std::string("two"));
+    ptr1.Emplace(&observer, std::string("two"));
     EXPECT_EQ(1, observer.GetConstructionCount("one"));
     EXPECT_EQ(1, observer.GetConstructionCount("two"));
     EXPECT_EQ(0, observer.GetDestructionCount("one"));
     EXPECT_EQ(0, observer.GetDestructionCount("two"));
   }
   EXPECT_EQ(1, observer.GetDestructionCount("one"));
   EXPECT_EQ(1, observer.GetDestructionCount("two"));
 }
 
 TEST(fxcrt, CountRefGetModify) {
@@ skipping 11 matching lines @@
       CFX_CountRef<Object> other(ptr);
       EXPECT_NE(nullptr, ptr.GetPrivateCopy(&observer, std::string("one")));
       EXPECT_EQ(2, observer.GetConstructionCount("one"));
       EXPECT_EQ(0, observer.GetDestructionCount("one"));
     }
     EXPECT_EQ(2, observer.GetConstructionCount("one"));
     EXPECT_EQ(1, observer.GetDestructionCount("one"));
   }
   EXPECT_EQ(2, observer.GetDestructionCount("one"));
 }