From 64a5ce6e15b17d130d2cdf5740df3a6ebe761ac6 Mon Sep 17 00:00:00 2001
From: Adam Roben <adam@roben.org>
Date: Mon, 7 Oct 2013 15:17:39 -0400
Subject: [PATCH] Update for move of scoped_nsobject header and namespace

See http://src.chromium.org/viewvc/chrome?view=revision&revision=207616.
---
 brightray/browser/inspectable_web_contents_view_mac.h | 4 ++--
 brightray/browser/notification_presenter_mac.h        | 6 +++---
 brightray/browser/notification_presenter_mac.mm       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/brightray/browser/inspectable_web_contents_view_mac.h b/brightray/browser/inspectable_web_contents_view_mac.h
index a03ccaf6361..1b5a6e43322 100644
--- a/brightray/browser/inspectable_web_contents_view_mac.h
+++ b/brightray/browser/inspectable_web_contents_view_mac.h
@@ -3,7 +3,7 @@
 
 #import "browser/inspectable_web_contents_view.h"
 
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 
 @class BRYInspectableWebContentsView;
 
@@ -26,7 +26,7 @@ private:
   // Owns us.
   InspectableWebContentsImpl* inspectable_web_contents_;
   
-  scoped_nsobject<BRYInspectableWebContentsView> view_;
+  base::scoped_nsobject<BRYInspectableWebContentsView> view_;
 
   DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewMac);
 };
diff --git a/brightray/browser/notification_presenter_mac.h b/brightray/browser/notification_presenter_mac.h
index 5cd2c87e40a..b3757bf56ea 100644
--- a/brightray/browser/notification_presenter_mac.h
+++ b/brightray/browser/notification_presenter_mac.h
@@ -8,7 +8,7 @@
 
 #import "browser/notification_presenter.h"
 
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #import <map>
 
 @class BRYUserNotificationCenterDelegate;
@@ -30,8 +30,8 @@ class NotificationPresenterMac : public NotificationPresenter {
       int notification_id) OVERRIDE;
 
  private:
-  std::map<std::string, scoped_nsobject<NSUserNotification>> notification_map_;
-  scoped_nsobject<BRYUserNotificationCenterDelegate> delegate_;
+  std::map<std::string, base::scoped_nsobject<NSUserNotification>> notification_map_;
+  base::scoped_nsobject<BRYUserNotificationCenterDelegate> delegate_;
 };
 
 }
diff --git a/brightray/browser/notification_presenter_mac.mm b/brightray/browser/notification_presenter_mac.mm
index 416e455503a..dc2ad9231fb 100644
--- a/brightray/browser/notification_presenter_mac.mm
+++ b/brightray/browser/notification_presenter_mac.mm
@@ -56,7 +56,7 @@ struct NotificationID {
   int notification_id;
 };
 
-scoped_nsobject<NSUserNotification> CreateUserNotification(
+base::scoped_nsobject<NSUserNotification> CreateUserNotification(
     const content::ShowDesktopNotificationHostMsgParams& params,
     int render_process_id,
     int render_view_id) {
@@ -65,7 +65,7 @@ scoped_nsobject<NSUserNotification> CreateUserNotification(
   notification.informativeText = base::SysUTF16ToNSString(params.body);
   notification.userInfo = NotificationID(render_process_id, render_view_id, params.notification_id).GetUserInfo();
 
-  return scoped_nsobject<NSUserNotification>(notification);
+  return base::scoped_nsobject<NSUserNotification>(notification);
 }
 
 }