mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.

ui/shell_dialogs/select_file_dialog_mac.mm

 // Copyright (c) 2012 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 "ui/shell_dialogs/select_file_dialog.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
 
 #include <map>
@@ skipping 11 matching lines @@
 #include "base/threading/thread_restrictions.h"
 #include "grit/ui_strings.h"
 #import "ui/base/cocoa/nib_loading.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
 const int kFileTypePopupTag = 1234;
 
 CFStringRef CreateUTIFromExtension(const base::FilePath::StringType& ext) {
-  base::mac::ScopedCFTypeRef<CFStringRef> ext_cf(
-      base::SysUTF8ToCFStringRef(ext));
+  base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
   return UTTypeCreatePreferredIdentifierForTag(
       kUTTagClassFilenameExtension, ext_cf.get(), NULL);
 }
 
 }  // namespace
 
 class SelectFileDialogImpl;
 
 // A bridge class to act as the modal delegate to the save/open sheet and send
 // the results to the C++ class.
@@ skipping 175 matching lines @@
       // it is not always the case that the given extensions in one of the sub-
       // lists are all synonyms. In fact, in the case of a <select> element with
       // multiple "accept" types, all the extensions allowed for all the types
       // will be part of one list. To be safe, allow the types of all the
       // specified extensions.
       NSMutableSet* file_type_set = [NSMutableSet set];
       for (size_t i = 0; i < file_types->extensions.size(); ++i) {
         const std::vector<base::FilePath::StringType>& ext_list =
             file_types->extensions[i];
         for (size_t j = 0; j < ext_list.size(); ++j) {
-          base::mac::ScopedCFTypeRef<CFStringRef> uti(
+          base::ScopedCFTypeRef<CFStringRef> uti(
               CreateUTIFromExtension(ext_list[j]));
           [file_type_set addObject:base::mac::CFToNSCast(uti.get())];
 
           // Always allow the extension itself, in case the UTI doesn't map
           // back to the original extension correctly. This occurs with dynamic
           // UTIs on 10.7 and 10.8.
           // See http://crbug.com/148840, http://openradar.me/12316273
-          base::mac::ScopedCFTypeRef<CFStringRef> ext_cf(
+          base::ScopedCFTypeRef<CFStringRef> ext_cf(
               base::SysUTF8ToCFStringRef(ext_list[j]));
           [file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
         }
       }
       allowed_file_types = [file_type_set allObjects];
     }
     if (type == SELECT_SAVEAS_FILE)
       [dialog setAllowedFileTypes:allowed_file_types];
     // else we'll pass it in when we run the open panel
 
@@ skipping 85 matching lines @@
     NSString* type_description;
     if (type < file_types->extension_description_overrides.size()) {
       type_description = base::SysUTF16ToNSString(
           file_types->extension_description_overrides[type]);
     } else {
       // No description given for a list of extensions; pick the first one from
       // the list (arbitrarily) and use its description.
       const std::vector<base::FilePath::StringType>& ext_list =
           file_types->extensions[type];
       DCHECK(!ext_list.empty());
-      base::mac::ScopedCFTypeRef<CFStringRef> uti(
+      base::ScopedCFTypeRef<CFStringRef> uti(
           CreateUTIFromExtension(ext_list[0]));
-      base::mac::ScopedCFTypeRef<CFStringRef> description(
+      base::ScopedCFTypeRef<CFStringRef> description(
           UTTypeCopyDescription(uti.get()));
 
       type_description =
           [[base::mac::CFToNSCast(description.get()) retain] autorelease];
     }
     [popup addItemWithTitle:type_description];
   }
 
   [popup selectItemAtIndex:file_type_index - 1];  // 1-based
   return accessory_view;
@@ skipping 62 matching lines @@
 
 namespace ui {
 
 SelectFileDialog* CreateMacSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
   return new SelectFileDialogImpl(listener, policy);
 }
 
 }  // namespace ui