Updates Android to reflect upstreaming of guards on npruntime.h includes
See http://trac.webkit.org/changeset/54880
Change-Id: I5665991bb4f7d3680c00b42194a9208d1daa90f0
diff --git a/WebCore/bindings/v8/NPV8Object.cpp b/WebCore/bindings/v8/NPV8Object.cpp
index 0c3bca2..53ceea1 100644
--- a/WebCore/bindings/v8/NPV8Object.cpp
+++ b/WebCore/bindings/v8/NPV8Object.cpp
@@ -42,9 +42,10 @@
#include "npruntime_impl.h"
#include "npruntime_priv.h"
-// ANDROID: Upstream to webkit.org
#if PLATFORM(CHROMIUM)
-#include "bindings/npruntime.h"
+#include <bindings/npruntime.h>
+#else
+#include "npruntime.h"
#endif
#include <stdio.h>
diff --git a/WebCore/bindings/v8/NPV8Object.h b/WebCore/bindings/v8/NPV8Object.h
index b9b376e..e5550ee 100644
--- a/WebCore/bindings/v8/NPV8Object.h
+++ b/WebCore/bindings/v8/NPV8Object.h
@@ -31,15 +31,17 @@
#define NPV8Object_h
#include "V8Index.h"
+
#if PLATFORM(CHROMIUM)
// FIXME: Chromium uses a different npruntime.h, which is in
// the Chromium source repository under third_party/npapi/bindings.
// The Google-specific changes in that file should probably be
// moved into bridge/npruntime.h, guarded by an #if PlATFORM(CHROMIUM).
-#include "bindings/npruntime.h"
+#include <bindings/npruntime.h>
#else
-#include "bridge/npruntime.h" // Use WebCore version for Android and other ports.
+#include "npruntime.h" // Use WebCore version for Android and other ports.
#endif
+
#include <v8.h>
namespace WebCore {
diff --git a/WebCore/bindings/v8/V8NPObject.h b/WebCore/bindings/v8/V8NPObject.h
index 58ad579..5924b3c 100644
--- a/WebCore/bindings/v8/V8NPObject.h
+++ b/WebCore/bindings/v8/V8NPObject.h
@@ -31,14 +31,14 @@
#ifndef V8NPObject_h
#define V8NPObject_h
-#include <v8.h>
#if PLATFORM(CHROMIUM)
-// TODO(andreip): diff and consolidate.
-#include "third_party/npapi/bindings/npruntime.h"
+#include <bindings/npruntime.h>
#else
-#include "bridge/npruntime.h" // use WebCore version
+#include "npruntime.h"
#endif
+#include <v8.h>
+
// These functions can be replaced by normal JS operation.
// Getters
v8::Handle<v8::Value> npObjectNamedPropertyGetter(v8::Local<v8::String> name, const v8::AccessorInfo&);
diff --git a/WebCore/bindings/v8/V8NPUtils.h b/WebCore/bindings/v8/V8NPUtils.h
index ffd612f..c978d2b 100644
--- a/WebCore/bindings/v8/V8NPUtils.h
+++ b/WebCore/bindings/v8/V8NPUtils.h
@@ -30,14 +30,14 @@
#ifndef V8NPUtils_h
#define V8NPUtils_h
-#include <v8.h>
#if PLATFORM(CHROMIUM)
-// TODO(andreip): diff and consolidate.
-#include "third_party/npapi/bindings/npruntime.h"
+#include <bindings/npruntime.h>
#else
-#include "bridge/npruntime.h" // use WebCore version
+#include "npruntime.h"
#endif
+#include <v8.h>
+
// Convert a V8 Value of any type (string, bool, object, etc) to a NPVariant.
void convertV8ObjectToNPVariant(v8::Local<v8::Value>, NPObject*, NPVariant*);
diff --git a/WebCore/bindings/v8/npruntime_impl.h b/WebCore/bindings/v8/npruntime_impl.h
index 4c43fb4..d2377eb 100644
--- a/WebCore/bindings/v8/npruntime_impl.h
+++ b/WebCore/bindings/v8/npruntime_impl.h
@@ -32,10 +32,9 @@
#define npruntime_impl_h
#if PLATFORM(CHROMIUM)
-// TODO(andreip): diff and consolidate
-#include "bindings/npruntime.h"
+#include <bindings/npruntime.h>
#else
-#include "bridge/npruntime.h" // use WebCore version
+#include "npruntime.h"
#endif
// This file exists to support WebCore, which expects to be able to call upon
diff --git a/WebCore/bindings/v8/npruntime_priv.h b/WebCore/bindings/v8/npruntime_priv.h
index 1fb326a..e5ac0e0 100644
--- a/WebCore/bindings/v8/npruntime_priv.h
+++ b/WebCore/bindings/v8/npruntime_priv.h
@@ -27,11 +27,9 @@
#define npruntime_priv_h
#if PLATFORM(CHROMIUM)
-// TODO(andreip): look at the diff between the two npruntime.h files
-// and try to consolidate them.
-#include "third_party/npapi/bindings/npruntime.h"
+#include <bindings/npruntime.h>
#else
-#include "bridge/npruntime.h"
+#include "npruntime.h"
#endif
#ifdef __cplusplus
