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

chrome/plugin/plugin_thread.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 "chrome/plugin/plugin_thread.h"
 
 #include "build/build_config.h"
 
 #if defined(USE_X11)
 #include <gtk/gtk.h>
@@ skipping 20 matching lines @@
 #include "net/base/net_errors.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #if defined(USE_X11)
 #include "app/x11_util.h"
 #elif defined(OS_MACOSX)
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/sys_string_conversions.h"
 #include "grit/chromium_strings.h"
 #endif
 
 static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls(
     base::LINKER_INITIALIZED);
 
 PluginThread::PluginThread()
     : preloaded_plugin_module_(NULL) {
   plugin_path_ =
@@ skipping 44 matching lines @@
   preloaded_plugin_module_ = base::LoadNativeLibrary(plugin_path_);
 
   ChromePluginLib::Create(plugin_path_, GetCPBrowserFuncsForPlugin());
 
   scoped_refptr<NPAPI::PluginLib> plugin =
       NPAPI::PluginLib::CreatePluginLib(plugin_path_);
   if (plugin.get()) {
     plugin->NP_Initialize();
 
 #if defined(OS_MACOSX)
-    scoped_cftyperef<CFStringRef> plugin_name(base::SysUTF16ToCFStringRef(
-        plugin->plugin_info().name));
-    scoped_cftyperef<CFStringRef> app_name(base::SysUTF16ToCFStringRef(
-        l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));
-    scoped_cftyperef<CFStringRef> process_name(CFStringCreateWithFormat(
-        kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"),
-        plugin_name.get(), app_name.get()));
+    base::mac::ScopedCFTypeRef<CFStringRef> plugin_name(
+        base::SysUTF16ToCFStringRef(plugin->plugin_info().name));
+    base::mac::ScopedCFTypeRef<CFStringRef> app_name(
+        base::SysUTF16ToCFStringRef(
+            l10n_util::GetStringUTF16(IDS_SHORT_PLUGIN_APP_NAME)));
+    base::mac::ScopedCFTypeRef<CFStringRef> process_name(
+        CFStringCreateWithFormat(kCFAllocatorDefault, NULL, CFSTR("%@ (%@)"),
+                                 plugin_name.get(), app_name.get()));
     mac_util::SetProcessName(process_name);
 #endif
   }
 
   // Certain plugins, such as flash, steal the unhandled exception filter
   // thus we never get crash reports when they fault. This call fixes it.
   message_loop()->set_exception_restoration(true);
 }
 
 PluginThread::~PluginThread() {
@@ skipping 112 matching lines @@
   }
 
   if (!result || net_error != net::OK)
     return false;
 
   *proxy_list = proxy_result;
   return true;
 }
 
 }  // namespace webkit_glue