Revert "Rename CPDF_CountedObject to CFX_WeakPtr::Handle"

core/fpdfapi/fpdf_page/include/cpdf_colorspace.h

 // 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.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #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"
 
 #define PDFCS_DEVICEGRAY 1
 #define PDFCS_DEVICERGB 2
 #define PDFCS_DEVICECMYK 3
 #define PDFCS_CALGRAY 4
 #define PDFCS_CALRGB 5
 #define PDFCS_LAB 6
 #define PDFCS_ICCBASED 7
@@ skipping 75 matching lines @@
                             FX_FLOAT m,
                             FX_FLOAT y,
                             FX_FLOAT k) const;
 
   int m_Family;
   uint32_t m_nComponents;
   CPDF_Array* m_pArray;
   uint32_t m_dwStdConversion;
 };
 
-using CPDF_CountedColorSpace = CFX_WeakPtr<CPDF_ColorSpace>::Handle;
-
 namespace std {
 
 // Make std::unique_ptr<CPDF_ColorSpace> call Release() rather than
 // simply deleting the object.
 template <>
 struct default_delete<CPDF_ColorSpace> {
   void operator()(CPDF_ColorSpace* pColorSpace) const {
     if (pColorSpace)
       pColorSpace->Release();
   }
 };
 
 }  // namespace std
 
 #endif  // CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_COLORSPACE_H_