Move base/values.h into the base namespace.

chrome/browser/prefs/scoped_user_pref_update.h

 // Copyright (c) 2011 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.
 //
 // A helper class that assists preferences in firing notifications when lists
 // or dictionaries are changed.
 
 #ifndef CHROME_BROWSER_PREFS_SCOPED_USER_PREF_UPDATE_H_
 #define CHROME_BROWSER_PREFS_SCOPED_USER_PREF_UPDATE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 
+class PrefService;
+
+namespace base {
 class DictionaryValue;
 class ListValue;
-class PrefService;
+}
 
 namespace subtle {
 
 // Base class for ScopedUserPrefUpdateTemplate that contains the parts
 // that do not depend on ScopedUserPrefUpdateTemplate's template parameter.
 //
 // We need this base class mostly for making it a friend of PrefService
 // and getting access to PrefService::GetMutableUserPref and
 // PrefService::ReportUserPrefChanged.
 class ScopedUserPrefUpdateBase : public base::NonThreadSafe {
  protected:
   ScopedUserPrefUpdateBase(PrefService* service, const char* path);
 
   // Calls Notify().
   virtual ~ScopedUserPrefUpdateBase();
 
   // Sets |value_| to |service_|->GetMutableUserPref and returns it.
-  Value* Get(Value::ValueType type);
+  base::Value* Get(Value::ValueType type);
 
  private:
   // If |value_| is not null, triggers a notification of PrefObservers and
   // resets |value_|.
   virtual void Notify();
 
   // Weak pointer.
   PrefService* service_;
   // Path of the preference being updated.
   std::string path_;
   // Cache of value from user pref store (set between Get() and Notify() calls).
-  Value* value_;
+  base::Value* value_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedUserPrefUpdateBase);
 };
 
 }  // namespace subtle
 
 // Class to support modifications to DictionaryValues and ListValues while
 // guaranteeing that PrefObservers are notified of changed values.
 //
 // This class may only be used on the UI thread as it requires access to the
@@ skipping 26 matching lines @@
   }
 
   T* operator->() {
     return Get();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedUserPrefUpdate);
 };
 
-typedef ScopedUserPrefUpdate<DictionaryValue, Value::TYPE_DICTIONARY>
+typedef ScopedUserPrefUpdate<base::DictionaryValue, Value::TYPE_DICTIONARY>
     DictionaryPrefUpdate;
-typedef ScopedUserPrefUpdate<ListValue, Value::TYPE_LIST> ListPrefUpdate;
+typedef ScopedUserPrefUpdate<base::ListValue, Value::TYPE_LIST> ListPrefUpdate;
 
 #endif  // CHROME_BROWSER_PREFS_SCOPED_USER_PREF_UPDATE_H_