7 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/ui/cocoa/animatable_image.mm b/chrome/browser/ui/cocoa/animatable_image.mm
index 2d09bf0..d2fd2da 100644
--- a/chrome/browser/ui/cocoa/animatable_image.mm
+++ b/chrome/browser/ui/cocoa/animatable_image.mm
@@ -130,7 +130,7 @@
 // Sets the layer contents by converting the NSImage to a CGImageRef.  This will
 // rasterize PDF resources.
 - (void)setLayerContents:(CALayer*)layer {
-  base::mac::ScopedCFTypeRef<CGImageRef> image(
+  base::ScopedCFTypeRef<CGImageRef> image(
       base::mac::CopyNSImageToCGImage(image_.get()));
   // Create the layer that will be animated.
   [layer setContents:(id)image.get()];
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
index 5fc37c5..0e66381 100644
--- a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
@@ -80,7 +80,7 @@ void ShowCertificateViewer(content::WebContents* web_contents,
 
 - (id)initWithCertificate:(net::X509Certificate*)certificate {
   if ((self = [super init])) {
-    base::mac::ScopedCFTypeRef<CFArrayRef> cert_chain(
+    base::ScopedCFTypeRef<CFArrayRef> cert_chain(
         certificate->CreateOSCertChainForCert());
     NSArray* certificates = base::mac::CFToNSCast(cert_chain.get());
     certificates_.reset([certificates retain]);
@@ -110,7 +110,7 @@ void ShowCertificateViewer(content::WebContents* web_contents,
   // the certificate viewer UI from displaying which certificate is revoked.
   // This is acceptable, as certificate revocation will still be shown in
   // the page info bubble if a certificate in the chain is actually revoked.
-  base::mac::ScopedCFTypeRef<CFMutableArrayRef> policies(
+  base::ScopedCFTypeRef<CFMutableArrayRef> policies(
       CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks));
   if (!policies.get()) {
     NOTREACHED();
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
index 88d9b79..49b080c 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.h
@@ -24,7 +24,7 @@ class SSLClientAuthObserverCocoaBridge;
     : NSObject<ConstrainedWindowSheet> {
  @private
   // The list of identities offered to the user.
-  base::mac::ScopedCFTypeRef<CFMutableArrayRef> identities_;
+  base::ScopedCFTypeRef<CFMutableArrayRef> identities_;
   // The corresponding list of certificates.
   std::vector<scoped_refptr<net::X509Certificate> > certificates_;
   // A C++ object to bridge SSLClientAuthObserver notifications to us.
diff --git a/chrome/browser/ui/cocoa/tabpose_window.h b/chrome/browser/ui/cocoa/tabpose_window.h
index b2e0f28..0e5a007 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.h
+++ b/chrome/browser/ui/cocoa/tabpose_window.h
@@ -54,8 +54,8 @@ class TabStripModelObserverBridge;
   CALayer* selectionHighlight_;  // weak
 
   // Colors used by the layers.
-  base::mac::ScopedCFTypeRef<CGColorRef> gray_;
-  base::mac::ScopedCFTypeRef<CGColorRef> darkBlue_;
+  base::ScopedCFTypeRef<CGColorRef> gray_;
+  base::ScopedCFTypeRef<CGColorRef> darkBlue_;
 
   TabStripModel* tabStripModel_;  // weak
 
@@ -77,7 +77,7 @@ class TabStripModelObserverBridge;
   scoped_ptr<TabStripModelObserverBridge> tabStripModelObserverBridge_;
 
   // The icon used for the closebutton layers.
-  base::mac::ScopedCFTypeRef<CGImageRef> closeIcon_;
+  base::ScopedCFTypeRef<CGImageRef> closeIcon_;
 
   // True if all close layers should be shown (as opposed to just the close
   // layer of the currently selected thumbnail).
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index 339abd7..3eb6cf2 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -89,11 +89,11 @@ const CGFloat kSelectionInset = 5;
 }
 
 - (void)drawInContext:(CGContextRef)context {
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> grayColorSpace(
+  base::ScopedCFTypeRef<CGColorSpaceRef> grayColorSpace(
       CGColorSpaceCreateWithName(kCGColorSpaceGenericGray));
   CGFloat grays[] = { startGray_, 1.0, endGray_, 1.0 };
   CGFloat locations[] = { 0, 1 };
-  base::mac::ScopedCFTypeRef<CGGradientRef> gradient(
+  base::ScopedCFTypeRef<CGGradientRef> gradient(
       CGGradientCreateWithColorComponents(
           grayColorSpace.get(), grays, locations, arraysize(locations)));
   CGPoint topLeft = CGPointMake(0.0, self.bounds.size.height);
@@ -120,7 +120,7 @@ class ThumbnailLoader;
 
   // If the backing store couldn't be used and a thumbnail was returned from a
   // renderer process, it's stored in |thumbnail_|.
-  base::mac::ScopedCFTypeRef<CGImageRef> thumbnail_;
+  base::ScopedCFTypeRef<CGImageRef> thumbnail_;
 
   // True if the layer already sent a thumbnail request to a renderer.
   BOOL didSendLoad_;
@@ -1031,7 +1031,7 @@ void AnimateCALayerOpacityFromTo(
   NSFont* font = [NSFont systemFontOfSize:tile.title_font_size()];
   tile.set_font_metrics([font ascender], -[font descender]);
 
-  base::mac::ScopedCFTypeRef<CGImageRef> favicon(
+  base::ScopedCFTypeRef<CGImageRef> favicon(
       base::mac::CopyNSImageToCGImage(tile.favicon()));
 
   CALayer* faviconLayer = [CALayer layer];
diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.h b/chrome/browser/ui/cocoa/tabs/tab_view.h
index 7f640d0..69d68d9 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_view.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.h
@@ -74,7 +74,7 @@ const CGFloat kImageNoFocusAlpha = 0.65;
 
   // A one-element mask image cache.  This cache makes drawing roughly 16%
   // faster.
-  base::mac::ScopedCFTypeRef<CGImageRef> maskCache_;
+  base::ScopedCFTypeRef<CGImageRef> maskCache_;
   CGFloat maskCacheWidth_;
   CGFloat maskCacheScale_;
 }
diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.mm b/chrome/browser/ui/cocoa/tabs/tab_view.mm
index 4312a9e..443f86b 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_view.mm
@@ -667,7 +667,7 @@ const CGFloat kRapidCloseDist = 2.5;
 
   // Image masks must be in the DeviceGray colorspace. Create a context and
   // draw the mask into it.
-  base::mac::ScopedCFTypeRef<CGColorSpaceRef> colorspace(
+  base::ScopedCFTypeRef<CGColorSpaceRef> colorspace(
       CGColorSpaceCreateDeviceGray());
   CGContextRef maskContext =
       CGBitmapContextCreate(NULL, tabWidth * scale, kMaskHeight * scale,