Move base/values.h into the base namespace. This includes a cros DEPS roll

with a minor change to that code since libcros also uses base/values.h.

BUG=88666
TEST=none
Review URL: http://codereview.chromium.org/7259019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92208 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 7 deletions

diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index 637b639..afb22e7 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -15,9 +15,12 @@
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/util_constants.h"
 
-class DictionaryValue;
 class FilePath;
 
+namespace base {
+class DictionaryValue;
+}
+
 class GoogleChromeDistribution : public BrowserDistribution {
  public:
   // Opens the Google Chrome uninstall survey window.
@@ -115,7 +118,7 @@ class GoogleChromeDistribution : public BrowserDistribution {
       const FilePath& file_path, std::wstring* uninstall_metrics);
 
   // Extracts uninstall metrics from the given JSON value.
-  virtual bool ExtractUninstallMetrics(const DictionaryValue& root,
+  virtual bool ExtractUninstallMetrics(const base::DictionaryValue& root,
                                        std::wstring* uninstall_metrics);
 
   // Given a DictionaryValue containing a set of uninstall metrics,
@@ -123,7 +126,7 @@ class GoogleChromeDistribution : public BrowserDistribution {
   // Returns true if at least one uninstall metric was found in
   // uninstall_metrics_dict, false otherwise.
   virtual bool BuildUninstallMetricsString(
-      DictionaryValue* uninstall_metrics_dict, std::wstring* metrics);
+      base::DictionaryValue* uninstall_metrics_dict, std::wstring* metrics);
 
   // The product ID for Google Update.
   std::wstring product_guid_;
diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc
index 19e2800..b2b83a5 100644
--- a/chrome/installer/util/google_chrome_distribution_dummy.cc
+++ b/chrome/installer/util/google_chrome_distribution_dummy.cc
@@ -14,6 +14,7 @@
 
 #include "base/file_path.h"
 #include "base/logging.h"
+#include "base/values.h"
 
 GoogleChromeDistribution::GoogleChromeDistribution()
     : BrowserDistribution(CHROME_BROWSER) {
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index a0cbfef..a05ae92 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -16,9 +16,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 
-class DictionaryValue;
 class FilePath;
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace installer {
 
 // This is the default name for the master preferences file used to pre-set
@@ -149,7 +152,7 @@ class MasterPreferences {
   //     }
   //  }
   //
-  bool GetExtensionsBlock(DictionaryValue** extensions) const;
+  bool GetExtensionsBlock(base::DictionaryValue** extensions) const;
 
   // Returns true iff the master preferences were successfully read from a file.
   bool read_from_file() const {
@@ -184,8 +187,8 @@ class MasterPreferences {
   void InitializeFromCommandLine(const CommandLine& cmd_line);
 
  protected:
-  scoped_ptr<DictionaryValue> master_dictionary_;
-  DictionaryValue* distribution_;
+  scoped_ptr<base::DictionaryValue> master_dictionary_;
+  base::DictionaryValue* distribution_;
   bool preferences_read_from_file_;
   bool ceee_;
   bool chrome_;