Renamed PPB_NaClUtil to PPB_NaCl as requested by brettw.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69580 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 36 insertions, 36 deletions

diff --git a/ppapi/c/private/ppb_nacl_util_private.h b/ppapi/c/private/ppb_nacl_private.h
index 462477f..3b07a9b 100644
--- a/ppapi/c/private/ppb_nacl_util_private.h
+++ b/ppapi/c/private/ppb_nacl_private.h
@@ -8,9 +8,9 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 
-#define PPB_NACLUTIL_PRIVATE_INTERFACE "PPB_NaClUtil(Private);0.1"
+#define PPB_NACL_PRIVATE_INTERFACE "PPB_NaCl(Private);0.1"
 
-struct PPB_NaClUtil_Private {
+struct PPB_NaCl_Private {
   // This function launches NaCl's sel_ldr process.  On success, the function
   // returns true, otherwise it returns false.  When it returns true, it will
   // write |socket_count| nacl::Handles to imc_handles and will write the
@@ -26,4 +26,4 @@ struct PPB_NaClUtil_Private {
   int (*UrandomFD)(void);
 };
 
-#endif  // PPAPI_C_PRIVATE_PPB_NACL_UTIL_PRIVATE_H_
+#endif  // PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp
index 7981a5b..16ca6ec 100644
--- a/ppapi/ppapi.gyp
+++ b/ppapi/ppapi.gyp
@@ -101,7 +101,7 @@
         'c/dev/ppp_zoom_dev.h',
 
         # Private interfaces.
-        'c/private/ppb_nacl_util_private.h',
+        'c/private/ppb_nacl_private.h',
 
         # Deprecated interfaces.
         'c/dev/deprecated_bool.h',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 8cafce2..13545b8 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -220,8 +220,8 @@
         '../plugins/ppapi/ppb_graphics_3d_impl.h',
         '../plugins/ppapi/ppb_image_data_impl.cc',
         '../plugins/ppapi/ppb_image_data_impl.h',
-        '../plugins/ppapi/ppb_nacl_util_private_impl.cc',
-        '../plugins/ppapi/ppb_nacl_util_private_impl.h',
+        '../plugins/ppapi/ppb_nacl_private_impl.cc',
+        '../plugins/ppapi/ppb_nacl_private_impl.h',
         '../plugins/ppapi/ppb_open_gl_es_impl.cc',
         '../plugins/ppapi/ppb_pdf.h',
         '../plugins/ppapi/ppb_pdf_impl.cc',
diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc
index 5129e71..374ca7a 100644
--- a/webkit/plugins/ppapi/plugin_module.cc
+++ b/webkit/plugins/ppapi/plugin_module.cc
@@ -46,7 +46,7 @@
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/c/ppp.h"
 #include "ppapi/c/ppp_instance.h"
-#include "ppapi/c/private/ppb_nacl_util_private.h"
+#include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 #include "webkit/plugins/ppapi/common.h"
@@ -66,7 +66,7 @@
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
-#include "webkit/plugins/ppapi/ppb_nacl_util_private_impl.h"
+#include "webkit/plugins/ppapi/ppb_nacl_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_pdf.h"
 #include "webkit/plugins/ppapi/ppb_pdf_impl.h"
 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
@@ -226,8 +226,8 @@ const void* GetInterface(const char* name) {
     return PPB_FileChooser_Impl::GetInterface();
   if (strcmp(name, PPB_FILEIO_DEV_INTERFACE) == 0)
     return PPB_FileIO_Impl::GetInterface();
-  if (strcmp(name, PPB_NACLUTIL_PRIVATE_INTERFACE) == 0)
-    return PPB_NaClUtil_Private_Impl::GetInterface();
+  if (strcmp(name, PPB_NACL_PRIVATE_INTERFACE) == 0)
+    return PPB_NaCl_Private_Impl::GetInterface();
   if (strcmp(name, PPB_FILEIOTRUSTED_DEV_INTERFACE) == 0)
     return PPB_FileIO_Impl::GetTrustedInterface();
   if (strcmp(name, PPB_FILEREF_DEV_INTERFACE) == 0)
diff --git a/webkit/plugins/ppapi/ppb_nacl_util_private_impl.cc b/webkit/plugins/ppapi/ppb_nacl_private_impl.cc
index df937cb..90e097c 100644
--- a/webkit/plugins/ppapi/ppb_nacl_util_private_impl.cc
+++ b/webkit/plugins/ppapi/ppb_nacl_private_impl.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/ppapi/ppb_nacl_util_private_impl.h"
+#include "webkit/plugins/ppapi/ppb_nacl_private_impl.h"
 
 #include "base/rand_util_c.h"
-#include "ppapi/c/private/ppb_nacl_util_private.h"
+#include "ppapi/c/private/ppb_nacl_private.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace webkit {
@@ -30,14 +30,14 @@ int UrandomFD(void) {
 
 }  // namespace
 
-const PPB_NaClUtil_Private ppb_nacl_util = {
+const PPB_NaCl_Private ppb_nacl = {
   &LaunchSelLdr,
   &UrandomFD,
 };
 
 // static
-const PPB_NaClUtil_Private* PPB_NaClUtil_Private_Impl::GetInterface() {
-  return &ppb_nacl_util;
+const PPB_NaCl_Private* PPB_NaCl_Private_Impl::GetInterface() {
+  return &ppb_nacl;
 }
 
 }  // namespace ppapi
diff --git a/webkit/plugins/ppapi/ppb_nacl_private_impl.h b/webkit/plugins/ppapi/ppb_nacl_private_impl.h
new file mode 100644
index 0000000..1c01e98
--- /dev/null
+++ b/webkit/plugins/ppapi/ppb_nacl_private_impl.h
@@ -0,0 +1,21 @@
+// Copyright (c) 2010 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_PLUGINS_PPAPI_PPB_NACL_PRIVATE_IMPL_H_
+#define WEBKIT_PLUGINS_PPAPI_PPB_NACL_PRIVATE_IMPL_H_
+
+struct PPB_NaCl_Private;
+
+namespace webkit {
+namespace ppapi {
+
+class PPB_NaCl_Private_Impl {
+ public:
+  static const PPB_NaCl_Private* GetInterface();
+};
+
+}  // namespace ppapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_PPAPI_PPB_NACL_PRIVATE_IMPL_H_
diff --git a/webkit/plugins/ppapi/ppb_nacl_util_private_impl.h b/webkit/plugins/ppapi/ppb_nacl_util_private_impl.h
deleted file mode 100644
index 179b78d..0000000
--- a/webkit/plugins/ppapi/ppb_nacl_util_private_impl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2010 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_PLUGINS_PPAPI_PPB_NACL_UTIL_PRIVATE_IMPL_H_
-#define WEBKIT_PLUGINS_PPAPI_PPB_NACL_UTIL_PRIVATE_IMPL_H_
-
-struct PPB_NaClUtil_Private;
-
-namespace webkit {
-namespace ppapi {
-
-class PPB_NaClUtil_Private_Impl {
- public:
-  static const PPB_NaClUtil_Private* GetInterface();
-};
-
-}  // namespace ppapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_PPAPI_PPB_NACL_UTIL_PRIVATE_IMPL_H_