7 files changed, 33 insertions, 34 deletions
diff --git a/webkit/glue/npruntime_util.cc b/content/child/npruntime_util.cc
index 1b249db..d8f4404 100644
--- a/webkit/glue/npruntime_util.cc
+++ b/content/child/npruntime_util.cc
@@ -1,15 +1,15 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/glue/npruntime_util.h"
+#include "content/child/npruntime_util.h"
 
 #include "base/pickle.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 
 using WebKit::WebBindings;
 
-namespace webkit_glue {
+namespace content {
 
 bool SerializeNPIdentifier(NPIdentifier identifier, Pickle* pickle) {
   const NPUTF8* string;
@@ -48,4 +48,4 @@ bool DeserializeNPIdentifier(PickleIterator* pickle_iter,
   return true;
 }
 
-}  // namespace webkit_glue
+}  // namespace content
diff --git a/content/child/npruntime_util.h b/content/child/npruntime_util.h
new file mode 100644
index 0000000..b9abc238
--- /dev/null
+++ b/content/child/npruntime_util.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2013 The Chromium 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 CONTENT_CHILD_NPRUNTIME_UTIL_H_
+#define CONTENT_CHILD_NPRUNTIME_UTIL_H_
+
+#include "third_party/npapi/bindings/npruntime.h"
+
+class Pickle;
+class PickleIterator;
+
+namespace content {
+
+// Efficiently serialize/deserialize a NPIdentifier
+bool SerializeNPIdentifier(NPIdentifier identifier, Pickle* pickle);
+bool DeserializeNPIdentifier(PickleIterator* pickle_iter,
+                             NPIdentifier* identifier);
+
+}  // namespace content
+
+#endif  // CONTENT_CHILD_NPRUNTIME_UTIL_H_
+
diff --git a/content/child/plugin_param_traits.cc b/content/child/plugin_param_traits.cc
index f50aecf..dd77979 100644
--- a/content/child/plugin_param_traits.cc
+++ b/content/child/plugin_param_traits.cc
@@ -5,9 +5,9 @@
 #include "content/child/plugin_param_traits.h"
 
 #include "base/strings/string_number_conversions.h"
+#include "content/child/npruntime_util.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
-#include "webkit/glue/npruntime_util.h"
 #include "webkit/plugins/npapi/plugin_host.h"
 
 namespace content {
@@ -115,13 +115,13 @@ void ParamTraits<NPVariant_Param>::Log(const param_type& p, std::string* l) {
 }
 
 void ParamTraits<NPIdentifier_Param>::Write(Message* m, const param_type& p) {
-  webkit_glue::SerializeNPIdentifier(p.identifier, m);
+  content::SerializeNPIdentifier(p.identifier, m);
 }
 
 bool ParamTraits<NPIdentifier_Param>::Read(const Message* m,
                                            PickleIterator* iter,
                                            param_type* r) {
-  return webkit_glue::DeserializeNPIdentifier(iter, &r->identifier);
+  return content::DeserializeNPIdentifier(iter, &r->identifier);
 }
 
 void ParamTraits<NPIdentifier_Param>::Log(const param_type& p, std::string* l) {
diff --git a/content/child/plugin_param_traits.h b/content/child/plugin_param_traits.h
index 4e45b03..6abd447 100644
--- a/content/child/plugin_param_traits.h
+++ b/content/child/plugin_param_traits.h
@@ -15,9 +15,9 @@
 #define CONTENT_CHILD_PLUGIN_PARAM_TRAITS_H_
 
 #include <string>
+#include "content/child/npruntime_util.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_param_traits.h"
-#include "webkit/glue/npruntime_util.h"
 
 namespace content {
 
diff --git a/content/content_child.gypi b/content/content_child.gypi
index 41fc35fc..5175385 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -55,6 +55,8 @@
     'child/npobject_base.h',
     'child/npobject_proxy.cc',
     'child/npobject_proxy.h',
+    'child/npruntime_util.cc',
+    'child/npruntime_util.h',
     'child/npobject_stub.cc',
     'child/npobject_stub.h',
     'child/npobject_util.cc',
diff --git a/webkit/glue/npruntime_util.h b/webkit/glue/npruntime_util.h
deleted file mode 100644
index 401f771..0000000
--- a/webkit/glue/npruntime_util.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) 2012 The Chromium 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 WEBKIT_GLUE_NPRUNTIME_UTIL_H_
-#define WEBKIT_GLUE_NPRUNTIME_UTIL_H_
-
-#include "third_party/npapi/bindings/npruntime.h"
-#include "webkit/glue/webkit_glue_export.h"
-
-class Pickle;
-class PickleIterator;
-
-namespace webkit_glue {
-
-// Efficiently serialize/deserialize a NPIdentifier
-WEBKIT_GLUE_EXPORT bool SerializeNPIdentifier(NPIdentifier identifier,
-                                              Pickle* pickle);
-WEBKIT_GLUE_EXPORT bool DeserializeNPIdentifier(PickleIterator* pickle_iter,
-                                                NPIdentifier* identifier);
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_GLUE_NPRUNTIME_UTIL_H_
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 32fc388..89287f6 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -280,8 +280,6 @@
         'image_decoder.cc',
         'image_decoder.h',
         'network_list_observer.h',
-        'npruntime_util.cc',
-        'npruntime_util.h',
         'resource_loader_bridge.cc',
         'resource_loader_bridge.h',
         'resource_request_body.cc',