Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/ppb_char_set_impl.cc

 // 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.
 
-#include "webkit/glue/plugins/pepper_char_set.h"
+#include "webkit/plugins/ppapi/ppb_char_set_impl.h"
 
 #include <stdlib.h>
 
 #include "base/i18n/icu_string_conversions.h"
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "unicode/ucnv.h"
 #include "unicode/ucnv_cb.h"
 #include "unicode/ucnv_err.h"
 #include "unicode/ustring.h"
-#include "webkit/glue/plugins/pepper_plugin_delegate.h"
-#include "webkit/glue/plugins/pepper_plugin_instance.h"
-#include "webkit/glue/plugins/pepper_plugin_module.h"
-#include "webkit/glue/plugins/pepper_var.h"
+#include "webkit/plugins/ppapi/plugin_delegate.h"
+#include "webkit/plugins/ppapi/plugin_instance.h"
+#include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/ppapi/var.h"
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 namespace {
 
 // Converts the given PP error handling behavior to the version in base,
 // placing the result in |*result| and returning true on success. Returns false
 // if the enum is invalid.
 bool PPToBaseConversionError(PP_CharSet_ConversionError on_error,
                              base::OnStringConversionError::Type* result) {
   switch (on_error) {
     case PP_CHARSET_CONVERSIONERROR_FAIL:
       *result = base::OnStringConversionError::FAIL;
       return true;
     case PP_CHARSET_CONVERSIONERROR_SKIP:
       *result = base::OnStringConversionError::SKIP;
       return true;
     case PP_CHARSET_CONVERSIONERROR_SUBSTITUTE:
       *result = base::OnStringConversionError::SUBSTITUTE;
       return true;
     default:
       return false;
   }
 }
 
 // The "substitution" behavior of this function does not match the
 // implementation in base, so we partially duplicate the code from
 // icu_string_conversions.cc with the correct error handling setup required
-// by this pepper interface.
+// by this PPAPI interface.
 char* UTF16ToCharSet(const uint16_t* utf16, uint32_t utf16_len,
                      const char* output_char_set,
                      PP_CharSet_ConversionError on_error,
                      uint32_t* output_length) {
   *output_length = 0;
 
   UErrorCode status = U_ZERO_ERROR;
   UConverter* converter = ucnv_open(output_char_set, &status);
   if (!U_SUCCESS(status))
     return NULL;
@@ skipping 94 matching lines @@
 
 const PPB_CharSet_Dev ppb_charset = {
   &UTF16ToCharSet,
   &CharSetToUTF16,
   &GetDefaultCharSet
 };
 
 }  // namespace
 
 // static
-const struct PPB_CharSet_Dev* CharSet::GetInterface() {
+const struct PPB_CharSet_Dev* PPB_CharSet_Impl::GetInterface() {
   return &ppb_charset;
 }
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
+