Move fxjs/include to fxjs

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2380713005

12 files changed, 37 insertions, 38 deletions

diff --git a/fxjs/cfxjse_arguments.cpp b/fxjs/cfxjse_arguments.cpp
index 1ff425d8b1..f1dcd2c153 100644
--- a/fxjs/cfxjse_arguments.cpp
+++ b/fxjs/cfxjse_arguments.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_arguments.h"
+#include "fxjs/cfxjse_arguments.h"
 
-#include "fxjs/include/cfxjse_context.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_context.h"
+#include "fxjs/cfxjse_value.h"
 
 v8::Isolate* CFXJSE_Arguments::GetRuntime() const {
   return m_pRetValue->GetIsolate();
diff --git a/fxjs/include/cfxjse_arguments.h b/fxjs/cfxjse_arguments.h
index e6c8659732..c38c2925ab 100644
--- a/fxjs/include/cfxjse_arguments.h
+++ b/fxjs/cfxjse_arguments.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_ARGUMENTS_H_
-#define FXJS_INCLUDE_CFXJSE_ARGUMENTS_H_
+#ifndef FXJS_CFXJSE_ARGUMENTS_H_
+#define FXJS_CFXJSE_ARGUMENTS_H_
 
 #include <memory>
 
-#include "fxjs/include/fxjse.h"
+#include "fxjs/fxjse.h"
 
 class CFXJSE_Class;
 
@@ -35,4 +35,4 @@ class CFXJSE_Arguments {
   CFXJSE_Value* m_pRetValue;
 };
 
-#endif  // FXJS_INCLUDE_CFXJSE_ARGUMENTS_H_
+#endif  // FXJS_CFXJSE_ARGUMENTS_H_
diff --git a/fxjs/cfxjse_class.cpp b/fxjs/cfxjse_class.cpp
index 6ccc0e2e24..c2c8e5fec2 100644
--- a/fxjs/cfxjse_class.cpp
+++ b/fxjs/cfxjse_class.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_class.h"
+#include "fxjs/cfxjse_class.h"
 
-#include "fxjs/include/cfxjse_context.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_context.h"
+#include "fxjs/cfxjse_value.h"
 
 namespace {
 
diff --git a/fxjs/include/cfxjse_class.h b/fxjs/cfxjse_class.h
index 13eb1adb7d..ac02b0d6e7 100644
--- a/fxjs/include/cfxjse_class.h
+++ b/fxjs/cfxjse_class.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_CLASS_H_
-#define FXJS_INCLUDE_CFXJSE_CLASS_H_
+#ifndef FXJS_CFXJSE_CLASS_H_
+#define FXJS_CFXJSE_CLASS_H_
 
-#include "fxjs/include/cfxjse_arguments.h"
-#include "fxjs/include/fxjse.h"
+#include "fxjs/cfxjse_arguments.h"
+#include "fxjs/fxjse.h"
 #include "v8/include/v8.h"
 
 class CFXJSE_Context;
@@ -42,4 +42,4 @@ class CFXJSE_Class {
   friend class CFXJSE_Value;
 };
 
-#endif  // FXJS_INCLUDE_CFXJSE_CLASS_H_
+#endif  // FXJS_CFXJSE_CLASS_H_
diff --git a/fxjs/cfxjse_context.cpp b/fxjs/cfxjse_context.cpp
index 4b0d0f67f7..93efc4f12c 100644
--- a/fxjs/cfxjse_context.cpp
+++ b/fxjs/cfxjse_context.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_context.h"
+#include "fxjs/cfxjse_context.h"
 
-#include "fxjs/include/cfxjse_class.h"
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_class.h"
+#include "fxjs/cfxjse_value.h"
 
 namespace {
 
diff --git a/fxjs/include/cfxjse_context.h b/fxjs/cfxjse_context.h
index 669fa89517..73f62647cc 100644
--- a/fxjs/include/cfxjse_context.h
+++ b/fxjs/cfxjse_context.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_CONTEXT_H_
-#define FXJS_INCLUDE_CFXJSE_CONTEXT_H_
+#ifndef FXJS_CFXJSE_CONTEXT_H_
+#define FXJS_CFXJSE_CONTEXT_H_
 
 #include <memory>
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
-#include "fxjs/include/fxjse.h"
+#include "fxjs/fxjse.h"
 #include "v8/include/v8.h"
 
 class CFXJSE_Class;
@@ -62,4 +62,4 @@ CFXJSE_HostObject* FXJSE_RetrieveObjectBinding(
     const v8::Local<v8::Object>& hJSObject,
     CFXJSE_Class* lpClass = nullptr);
 
-#endif  // FXJS_INCLUDE_CFXJSE_CONTEXT_H_
+#endif  // FXJS_CFXJSE_CONTEXT_H_
diff --git a/fxjs/cfxjse_runtimedata.cpp b/fxjs/cfxjse_runtimedata.cpp
index 021fb1dbe4..017916a248 100644
--- a/fxjs/cfxjse_runtimedata.cpp
+++ b/fxjs/cfxjse_runtimedata.cpp
@@ -7,7 +7,7 @@
 #include "fxjs/cfxjse_runtimedata.h"
 
 #include "fxjs/cfxjse_isolatetracker.h"
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 namespace {
 
diff --git a/fxjs/cfxjse_value.cpp b/fxjs/cfxjse_value.cpp
index b1fc0784e8..d0a428c9c3 100644
--- a/fxjs/cfxjse_value.cpp
+++ b/fxjs/cfxjse_value.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/cfxjse_value.h"
+#include "fxjs/cfxjse_value.h"
 
 #include <math.h>
 
-#include "fxjs/include/cfxjse_class.h"
-#include "fxjs/include/cfxjse_context.h"
+#include "fxjs/cfxjse_class.h"
+#include "fxjs/cfxjse_context.h"
 
 namespace {
 
diff --git a/fxjs/include/cfxjse_value.h b/fxjs/cfxjse_value.h
index 9fd1bee786..91819d81e4 100644
--- a/fxjs/include/cfxjse_value.h
+++ b/fxjs/cfxjse_value.h
@@ -4,15 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_CFXJSE_VALUE_H_
-#define FXJS_INCLUDE_CFXJSE_VALUE_H_
-
-#include "v8/include/v8.h"
+#ifndef FXJS_CFXJSE_VALUE_H_
+#define FXJS_CFXJSE_VALUE_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "fxjs/cfxjse_isolatetracker.h"
 #include "fxjs/cfxjse_runtimedata.h"
+#include "v8/include/v8.h"
 
 class CFXJSE_Class;
 class CFXJSE_HostObject;
@@ -99,4 +98,4 @@ class CFXJSE_Value {
   v8::Global<v8::Value> m_hValue;
 };
 
-#endif  // FXJS_INCLUDE_CFXJSE_VALUE_H_
+#endif  // FXJS_CFXJSE_VALUE_H_
diff --git a/fxjs/fxjs_v8.cpp b/fxjs/fxjs_v8.cpp
index e967feef75..d74d355dc9 100644
--- a/fxjs/fxjs_v8.cpp
+++ b/fxjs/fxjs_v8.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fxjs/include/fxjs_v8.h"
+#include "fxjs/fxjs_v8.h"
 
 #include <vector>
 
diff --git a/fxjs/include/fxjs_v8.h b/fxjs/fxjs_v8.h
index a9064f3faf..5f658989a5 100644
--- a/fxjs/include/fxjs_v8.h
+++ b/fxjs/fxjs_v8.h
@@ -11,8 +11,8 @@
 // PDFium code should include this file rather than including V8 headers
 // directly.
 
-#ifndef FXJS_INCLUDE_FXJS_V8_H_
-#define FXJS_INCLUDE_FXJS_V8_H_
+#ifndef FXJS_FXJS_V8_H_
+#define FXJS_FXJS_V8_H_
 
 #include <v8-util.h>
 #include <v8.h>
@@ -259,4 +259,4 @@ class CFXJS_Engine {
   std::map<CFX_WideString, v8::Global<v8::Array>> m_ConstArrays;
 };
 
-#endif  // FXJS_INCLUDE_FXJS_V8_H_
+#endif  // FXJS_FXJS_V8_H_
diff --git a/fxjs/include/fxjse.h b/fxjs/fxjse.h
index eafae88d2d..0ba285d746 100644
--- a/fxjs/include/fxjse.h
+++ b/fxjs/fxjse.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FXJS_INCLUDE_FXJSE_H_
-#define FXJS_INCLUDE_FXJSE_H_
+#ifndef FXJS_FXJSE_H_
+#define FXJS_FXJSE_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
@@ -71,4 +71,4 @@ void FXJSE_Runtime_Release(v8::Isolate* pIsolate);
 
 void FXJSE_ThrowMessage(const CFX_ByteStringC& utf8Message);
 
-#endif  // FXJS_INCLUDE_FXJSE_H_
+#endif  // FXJS_FXJSE_H_