Revert "Rename CPDF_CountedObject to CFX_WeakPtr::Handle"

core/fpdfapi/fpdf_page/include/cpdf_colorspace.h

Index: core/fpdfapi/fpdf_page/include/cpdf_colorspace.h
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h
index 2166f9b3a8390785590f20020255c591b9e754ed..f08c8d8c5d3d98311fc7d6346a6f1ed51686d2c3 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_colorspace.h
@@ -6,10 +6,8 @@
 
 #ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_
 #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_
-

[Lei Zhang, 2016/09/28 19:23:55]

accidental line deletion?

[Tom Sepez, 2016/09/28 20:10:03]

Yep. the only manual merge. done.

 #include <memory>
 
-#include "core/fxcrt/include/cfx_weak_ptr.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 
@@ -105,8 +103,6 @@ class CPDF_ColorSpace {
   uint32_t m_dwStdConversion;
 };
 
-using CPDF_CountedColorSpace = CFX_WeakPtr<CPDF_ColorSpace>::Handle;
-
 namespace std {
 
 // Make std::unique_ptr<CPDF_ColorSpace> call Release() rather than