Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

chrome/plugin/webplugin_proxy.cc

 // Copyright (c) 2009 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 "chrome/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
+#include "base/mac/scoped_cftyperef.h"
 #endif
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "base/singleton.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_proxy.h"
 #include "chrome/plugin/npobject_util.h"
@@ skipping 187 matching lines @@
 
   return window_npobject_;
 }
 
 NPObject* WebPluginProxy::GetPluginElement() {
   if (plugin_element_)
     return WebBindings::retainObject(plugin_element_);
 
   int npobject_route_id = channel_->GenerateRouteID();
   bool success = false;
-  Send(new PluginHostMsg_GetPluginElement(route_id_, npobject_route_id, &success));
+  Send(new PluginHostMsg_GetPluginElement(route_id_, npobject_route_id,
+                                          &success));
   if (!success)
     return NULL;
 
   plugin_element_ = NPObjectProxy::Create(
       channel_, npobject_route_id, containing_window_, page_url_);
 
   return plugin_element_;
 }
 
 void WebPluginProxy::SetCookie(const GURL& url,
@@ skipping 177 matching lines @@
 #if defined(OS_MACOSX)
   CGContextSaveGState(windowless_context_);
   // It is possible for windowless_context_ to change during plugin painting
   // (since the plugin can make a synchronous call during paint event handling),
   // in which case we don't want to try to restore it later. Not an owning ref
   // since owning the ref without owning the shared backing memory doesn't make
   // sense, so this should only be used for pointer comparisons.
   CGContextRef saved_context_weak = windowless_context_.get();
 
   if (background_context_.get()) {
-    scoped_cftyperef<CGImageRef> image(
+    base::mac::ScopedCFTypeRef<CGImageRef> image(
         CGBitmapContextCreateImage(background_context_));
     CGRect source_rect = rect.ToCGRect();
     // Flip the rect we use to pull from the canvas, since it's upside-down.
     source_rect.origin.y = CGImageGetHeight(image) - rect.y() - rect.height();
-    scoped_cftyperef<CGImageRef> sub_image(
+    base::mac::ScopedCFTypeRef<CGImageRef> sub_image(
         CGImageCreateWithImageInRect(image, source_rect));
     CGContextDrawImage(windowless_context_, rect.ToCGRect(), sub_image);
   } else if (transparent_) {
     CGContextClearRect(windowless_context_, rect.ToCGRect());
   }
   CGContextClipToRect(windowless_context_, rect.ToCGRect());
   delegate_->Paint(windowless_context_, rect);
   if (windowless_context_.get() == saved_context_weak)
     CGContextRestoreGState(windowless_context_);
 #else
@@ skipping 280 matching lines @@
   while (index != resource_clients_.end()) {
     WebPluginResourceClient* client = (*index).second;
 
     if (client == resource_client) {
       resource_clients_.erase(index++);
     } else {
       index++;
     }
   }
 }