Convert the pp::proxy namespace to the ppapi::proxy namespace.

ppapi/proxy/ppb_font_proxy.cc

 // Copyright (c) 2011 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 "ppapi/proxy/ppb_font_proxy.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_image_data_proxy.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_image_data_api.h"
 #include "ppapi/thunk/thunk.h"
 
-using ppapi::HostResource;
-using ppapi::Resource;
-using ppapi::StringVar;
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_ImageData_API;

[bbudge, 2011/08/16 22:40:49]

Why not also declare PPB_Font_API and PPB_Font_Function_API here? They're
explicitly qualified below.

-using ppapi::WebKitForwarding;
 
-namespace pp {
+namespace ppapi {
 namespace proxy {
 
 namespace {
 
 bool PPTextRunToTextRun(const PP_TextRun_Dev* run,
                         WebKitForwarding::Font::TextRun* output) {
   scoped_refptr<StringVar> str(StringVar::FromPPVar(run->text));
   if (!str)
     return false;
 
@@ skipping 14 matching lines @@
                                const void* target_interface)
     : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPB_Font_Proxy::~PPB_Font_Proxy() {
 }
 
 // static
 const InterfaceProxy::Info* PPB_Font_Proxy::GetInfo() {
   static const Info info = {
-    ::ppapi::thunk::GetPPB_Font_Thunk(),
+    thunk::GetPPB_Font_Thunk(),
     PPB_FONT_DEV_INTERFACE,
     INTERFACE_ID_PPB_FONT,
     false,
     &CreateFontProxy,
   };
   return &info;
 }
 
-::ppapi::thunk::PPB_Font_FunctionAPI* PPB_Font_Proxy::AsPPB_Font_FunctionAPI() {
+thunk::PPB_Font_FunctionAPI* PPB_Font_Proxy::AsPPB_Font_FunctionAPI() {
   return this;
 }
 
 PP_Var PPB_Font_Proxy::GetFontFamilies(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_MakeUndefined();
 
   // Assume the font families don't change, so we can cache the result globally.
   static std::string families;
@@ skipping 27 matching lines @@
                                &webkit_event_, desc,
                                face.get() ? face->value() : std::string(),
                                dispatcher->preferences(),
                                &font_forwarding_));
 }
 
 Font::~Font() {
   RunOnWebKitThread(false, base::Bind(&DeleteFontForwarding, font_forwarding_));
 }
 
-ppapi::thunk::PPB_Font_API* Font::AsPPB_Font_API() {
+thunk::PPB_Font_API* Font::AsPPB_Font_API() {
   return this;
 }
 
 PP_Bool Font::Describe(PP_FontDescription_Dev* description,
                        PP_FontMetrics_Dev* metrics) {
   TRACE_EVENT0("ppapi proxy", "Font::Describe");
   std::string face;
   PP_Bool result = PP_FALSE;
   RunOnWebKitThread(true,
                     base::Bind(&WebKitForwarding::Font::Describe,
@@ skipping 91 matching lines @@
   return result;
 }
 
 void Font::RunOnWebKitThread(bool blocking, const base::Closure& task) {
   PluginDispatcher::GetForResource(this)->PostToWebKitThread(FROM_HERE, task);
   if (blocking)
     webkit_event_.Wait();
 }
 
 // static
-void Font::DeleteFontForwarding(
-    ppapi::WebKitForwarding::Font* font_forwarding) {
+void Font::DeleteFontForwarding(WebKitForwarding::Font* font_forwarding) {
   delete font_forwarding;
 }
 
 }  // namespace proxy
-}  // namespace pp
+}  // namespace ppapi