Move core/fxcrt/include to core/fxcrt

core/fxcrt/cfx_observable.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.
 
-#ifndef CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
-#define CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
+#ifndef CORE_FXCRT_CFX_OBSERVABLE_H_
+#define CORE_FXCRT_CFX_OBSERVABLE_H_
 
 #include <set>
 
-#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/fx_system.h"
 #include "third_party/base/stl_util.h"
 
 template <class T>
 class CFX_Observable {
  public:
   class ObservedPtr {
    public:
     ObservedPtr() : m_pObservedPtr(nullptr) {}
     explicit ObservedPtr(T* pObservedPtr) : m_pObservedPtr(pObservedPtr) {
       if (m_pObservedPtr)
@@ skipping 47 matching lines @@
   }
   CFX_Observable& operator=(const CFX_Observable& that) = delete;
 
  protected:
   size_t ActiveObservedPtrsForTesting() const { return m_ObservedPtrs.size(); }
 
  private:
   std::set<ObservedPtr*> m_ObservedPtrs;
 };
 
-#endif  // CORE_FXCRT_INCLUDE_CFX_OBSERVABLE_H_
+#endif  // CORE_FXCRT_CFX_OBSERVABLE_H_