From a852203c1ae878c97ef5f64eec9b89e57642a78b Mon Sep 17 00:00:00 2001
From: "thakis@chromium.org"
 <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 24 Jun 2013 22:51:46 +0000
Subject: mac: Update clients of scoped_nsobject.h.

1.) The header is now in base/mac instead of base/memory
2.) The class is now in namespace base.

This CL was created programmatically by running:

1.)
    git grep -l memory/scoped_nsobject.h | xargs sed -i -e 's/memory\/scoped_nsobject.h/mac\/scoped_nsobject.h/g'
    for f in $(git diff --name-only origin); do tools/sort-headers.py $f -f; done
    git commit -a -m headers
    # manually undo changes to gypi file
    git cl upload # patch set 1
2.)
    git grep -l 'scoped_nsobject<' | xargs sed -i -e 's/scoped_nsobject</base::scoped_nsobject</g'
    # manually undo comment changes in scoped_nsobject.h, tracking_area.h
    git commit -a -m format
    git cl upload # patch set 2
    # Manually audit all files, file bugs and clean up bad clang-format decisions
    git cl upload # patch set 3
BUG=251957
TBR=mark@chromium.org

Review URL: https://codereview.chromium.org/17593006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208283 0039d316-1c4b-4281-b951-d872f2087c98
---
 rlz/mac/lib/rlz_value_store_mac.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'rlz/mac')

diff --git a/rlz/mac/lib/rlz_value_store_mac.h b/rlz/mac/lib/rlz_value_store_mac.h
index b7ffb4e..117e901 100644
--- a/rlz/mac/lib/rlz_value_store_mac.h
+++ b/rlz/mac/lib/rlz_value_store_mac.h
@@ -5,9 +5,9 @@
 #ifndef RLZ_MAC_LIB_RLZ_VALUE_STORE_MAC_H_
 #define RLZ_MAC_LIB_RLZ_VALUE_STORE_MAC_H_
 
-#include "rlz/lib/rlz_value_store.h"
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
+#include "rlz/lib/rlz_value_store.h"
 
 @class NSDictionary;
 @class NSMutableDictionary;
@@ -69,8 +69,8 @@ class RlzValueStoreMac : public RlzValueStore {
   // product p.
   NSMutableDictionary* ProductDict(Product p);
 
-  scoped_nsobject<NSMutableDictionary> dict_;
-  scoped_nsobject<NSString> plist_path_;
+  base::scoped_nsobject<NSMutableDictionary> dict_;
+  base::scoped_nsobject<NSString> plist_path_;
 
   DISALLOW_COPY_AND_ASSIGN(RlzValueStoreMac);
 };
-- 
cgit v1.1