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

1 files changed, 6 insertions, 3 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_;