Move base/values.h into the base namespace.

chrome/browser/chromeos/customization_document.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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #define CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_
 #pragma once
 
 #include <map>
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/timer.h"
 #include "base/values.h"
 #include "content/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 
-class DictionaryValue;
 class FilePath;
-class ListValue;
 class PrefService;
 
 namespace base {
-  class Time;
+class DictionaryValue;
+class ListValue;
+class Time;
 }
 
 namespace chromeos {
 
 namespace system {
 class StatisticsProvider;
 }  // system
 
 // Base class for OEM customization document classes.
 class CustomizationDocument {
  public:
   virtual ~CustomizationDocument();
 
   // Return true if the document was successfully fetched and parsed.
   bool IsReady() const { return root_.get(); }
 
  protected:
   CustomizationDocument();
 
   virtual bool LoadManifestFromFile(const FilePath& manifest_path);
   virtual bool LoadManifestFromString(const std::string& manifest);
 
   std::string GetLocaleSpecificString(const std::string& locale,
                                       const std::string& dictionary_name,
                                       const std::string& entry_name) const;
 
-  scoped_ptr<DictionaryValue> root_;
+  scoped_ptr<base::DictionaryValue> root_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CustomizationDocument);
 };
 
 // OEM startup customization document class.
 // Now StartupCustomizationDocument is loaded in c-tor so just after create it
 // may be ready or not (if manifest is missing or corrupted) and this state
 // won't be changed later (i.e. IsReady() always return the same value).
 class StartupCustomizationDocument : public CustomizationDocument {
@@ skipping 40 matching lines @@
 // ServicesCustomizationDocument is fetched from network or local file but on
 // FILE thread therefore it may not be ready just after creation. Fetching of
 // the manifest should be initiated outside this class by calling
 // StartFetching() method. User of the file should check IsReady before use it.
 class ServicesCustomizationDocument : public CustomizationDocument,
                                       private URLFetcher::Delegate {
  public:
   // OEM specific carrier deal.
   class CarrierDeal {
    public:
-    explicit CarrierDeal(DictionaryValue* deal_dict);
+    explicit CarrierDeal(base::DictionaryValue* deal_dict);
     ~CarrierDeal();
 
     // Returns string with the specified |locale| and |id|.
     // If there's no version for |locale|, default one is returned.
     // If there's no string with specified |id|, empty string is returned.
     std::string GetLocalizedString(const std::string& locale,
                                    const std::string& id) const;
 
     const std::string& deal_locale() const { return deal_locale_; }
     const std::string& info_url() const { return info_url_; }
     const std::string& top_up_url() const { return top_up_url_; }
     int notification_count() const { return notification_count_; }
     base::Time expire_date() const { return expire_date_; }
 
    private:
     std::string deal_locale_;
     std::string info_url_;
     std::string top_up_url_;
     int notification_count_;
     base::Time expire_date_;
-    DictionaryValue* localized_strings_;
+    base::DictionaryValue* localized_strings_;
 
     DISALLOW_COPY_AND_ASSIGN(CarrierDeal);
   };
 
   // Carrier ID (ex. "Verizon (us)") mapping to carrier deals.
   typedef std::map<std::string, CarrierDeal*> CarrierDeals;
 
   static ServicesCustomizationDocument* GetInstance();
 
   // Registers preferences.
@@ skipping 73 matching lines @@
 
   // Initial locale value.
   std::string initial_locale_;
 
   DISALLOW_COPY_AND_ASSIGN(ServicesCustomizationDocument);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CUSTOMIZATION_DOCUMENT_H_