Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm |
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm |
index f1e44d943e92de0d1d41ea3b69f3d6191b68c845..93e537ce56213904cb617461500b61f6a892fc64 100644 |
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm |
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm |
@@ -82,7 +82,7 @@ CollectedCookiesMac::CollectedCookiesMac(content::WebContents* web_contents) { |
initWithWebContents:web_contents |
collectedCookiesMac:this]); |
- scoped_nsobject<CustomConstrainedWindowSheet> sheet( |
+ base::scoped_nsobject<CustomConstrainedWindowSheet> sheet( |
[[CustomConstrainedWindowSheet alloc] |
initWithCustomWindow:[sheet_controller_ window]]); |
window_.reset(new ConstrainedWindowMac( |
@@ -170,7 +170,7 @@ void CollectedCookiesMac::OnConstrainedWindowClosed( |
green:kBannerGradientColorBottom[1] |
blue:kBannerGradientColorBottom[2] |
alpha:1.0]; |
- scoped_nsobject<NSGradient> bannerGradient( |
+ base::scoped_nsobject<NSGradient> bannerGradient( |
[[NSGradient alloc] initWithStartingColor:bannerStartingColor |
endingColor:bannerEndingColor]); |
[infoBar_ setGradient:bannerGradient]; |
@@ -382,7 +382,7 @@ void CollectedCookiesMac::OnConstrainedWindowClosed( |
// Create the Cocoa model. |
CookieTreeNode* root = |
static_cast<CookieTreeNode*>(allowedTreeModel_->GetRoot()); |
- scoped_nsobject<CocoaCookieTreeNode> model( |
+ base::scoped_nsobject<CocoaCookieTreeNode> model( |
[[CocoaCookieTreeNode alloc] initWithNode:root]); |
[self setCocoaAllowedTreeModel:model.get()]; // Takes ownership. |
root = static_cast<CookieTreeNode*>(blockedTreeModel_->GetRoot()); |