Update some uses of Value in chrome/ to use the base:: namespace.

BUG=88666
TEST=no change
TBR=ben@chromium.org

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

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

8 files changed, 24 insertions, 22 deletions

diff --git a/chrome/browser/web_resource/json_asynchronous_unpacker.cc b/chrome/browser/web_resource/json_asynchronous_unpacker.cc
index 9135cc5..b9b6fa5 100644
--- a/chrome/browser/web_resource/json_asynchronous_unpacker.cc
+++ b/chrome/browser/web_resource/json_asynchronous_unpacker.cc
@@ -66,7 +66,7 @@ class JSONAsynchronousUnpackerImpl
   }
 
   void OnUnpackWebResourceSucceeded(
-      const DictionaryValue& parsed_json) {
+      const base::DictionaryValue& parsed_json) {
     if (delegate_)
       delegate_->OnUnpackFinished(parsed_json);
     Cleanup();
diff --git a/chrome/browser/web_resource/json_asynchronous_unpacker.h b/chrome/browser/web_resource/json_asynchronous_unpacker.h
index 4a58047..9ae22189 100644
--- a/chrome/browser/web_resource/json_asynchronous_unpacker.h
+++ b/chrome/browser/web_resource/json_asynchronous_unpacker.h
@@ -16,7 +16,7 @@ class JSONAsynchronousUnpackerDelegate {
 
   // This will be called when the response is parsed properly. |parsed_json|
   // contains the decoded information.
-  virtual void OnUnpackFinished(const DictionaryValue& parsed_json) = 0;
+  virtual void OnUnpackFinished(const base::DictionaryValue& parsed_json) = 0;
 
   // This will be called if there is an error while parsing the data.
   virtual void OnUnpackError(const std::string& error_message) = 0;
diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc
index a474b7a..6ebfe0c 100644
--- a/chrome/browser/web_resource/notification_promo.cc
+++ b/chrome/browser/web_resource/notification_promo.cc
@@ -147,7 +147,7 @@ base::Value* DeepCopyAndResolveStrings(
       return copy;
     }
 
-    case Value::TYPE_DICTIONARY: {
+    case base::Value::TYPE_DICTIONARY: {
       const base::DictionaryValue* dict =
           static_cast<const base::DictionaryValue*>(node);
       base::DictionaryValue* copy = new base::DictionaryValue;
@@ -161,7 +161,7 @@ base::Value* DeepCopyAndResolveStrings(
       return copy;
     }
 
-    case Value::TYPE_STRING: {
+    case base::Value::TYPE_STRING: {
       std::string value;
       bool rv = node->GetAsString(&value);
       DCHECK(rv);
@@ -206,23 +206,23 @@ NotificationPromo::NotificationPromo()
 
 NotificationPromo::~NotificationPromo() {}
 
-void NotificationPromo::InitFromJson(const DictionaryValue& json,
+void NotificationPromo::InitFromJson(const base::DictionaryValue& json,
                                      PromoType promo_type) {
   promo_type_ = promo_type;
-  const ListValue* promo_list = NULL;
+  const base::ListValue* promo_list = NULL;
   DVLOG(1) << "InitFromJson " << PromoTypeToString(promo_type_);
   if (!json.GetList(PromoTypeToString(promo_type_), &promo_list))
     return;
 
   // No support for multiple promos yet. Only consider the first one.
-  const DictionaryValue* promo = NULL;
+  const base::DictionaryValue* promo = NULL;
   if (!promo_list->GetDictionary(0, &promo))
     return;
 
   // Date.
-  const ListValue* date_list = NULL;
+  const base::ListValue* date_list = NULL;
   if (promo->GetList("date", &date_list)) {
-    const DictionaryValue* date;
+    const base::DictionaryValue* date;
     if (date_list->GetDictionary(0, &date)) {
       std::string time_str;
       base::Time time;
@@ -242,7 +242,7 @@ void NotificationPromo::InitFromJson(const DictionaryValue& json,
   }
 
   // Grouping.
-  const DictionaryValue* grouping = NULL;
+  const base::DictionaryValue* grouping = NULL;
   if (promo->GetDictionary("grouping", &grouping)) {
     grouping->GetInteger("buckets", &num_groups_);
     grouping->GetInteger("segment", &initial_segment_);
@@ -258,11 +258,11 @@ void NotificationPromo::InitFromJson(const DictionaryValue& json,
   }
 
   // Strings.
-  const DictionaryValue* strings = NULL;
+  const base::DictionaryValue* strings = NULL;
   promo->GetDictionary("strings", &strings);
 
   // Payload.
-  const DictionaryValue* payload = NULL;
+  const base::DictionaryValue* payload = NULL;
   if (promo->GetDictionary("payload", &payload)) {
     base::Value* ppcopy = DeepCopyAndResolveStrings(payload, strings);
     DCHECK(ppcopy && ppcopy->IsType(base::Value::TYPE_DICTIONARY));
@@ -274,7 +274,7 @@ void NotificationPromo::InitFromJson(const DictionaryValue& json,
     // For compatibility with the legacy desktop version,
     // if no |payload.promo_message_short| is specified,
     // the first string in |strings| is used.
-    DictionaryValue::Iterator iter(*strings);
+    base::DictionaryValue::Iterator iter(*strings);
     iter.value().GetAsString(&promo_text_);
   }
   DVLOG(1) << "promo_text_=" << promo_text_;
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc
index 5963568..95c9e76 100644
--- a/chrome/browser/web_resource/promo_resource_service.cc
+++ b/chrome/browser/web_resource/promo_resource_service.cc
@@ -163,7 +163,7 @@ void PromoResourceService::PromoResourceStateChange() {
                   content::NotificationService::NoDetails());
 }
 
-void PromoResourceService::Unpack(const DictionaryValue& parsed_json) {
+void PromoResourceService::Unpack(const base::DictionaryValue& parsed_json) {
   for (size_t i = 0; i < arraysize(kValidPromoTypes); ++i) {
     NotificationPromo notification_promo;
     notification_promo.InitFromJson(parsed_json, kValidPromoTypes[i]);
diff --git a/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc b/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc
index 0ee9a77..d8b3966 100644
--- a/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc
+++ b/chrome/browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc
@@ -46,9 +46,9 @@ class NotificationPromoMobileNtpTest {
             const std::string& promo_action_type,
             const std::string& promo_action_arg0,
             const std::string& promo_action_arg1) {
-    Value* value(base::JSONReader::Read(json));
+    base::Value* value(base::JSONReader::Read(json));
     ASSERT_TRUE(value);
-    DictionaryValue* dict = NULL;
+    base::DictionaryValue* dict = NULL;
     value->GetAsDictionary(&dict);
     ASSERT_TRUE(dict);
     test_json_.reset(dict);
@@ -122,7 +122,7 @@ class NotificationPromoMobileNtpTest {
  private:
   NotificationPromoMobileNtp mobile_promo_;
   bool received_notification_;
-  scoped_ptr<DictionaryValue> test_json_;
+  scoped_ptr<base::DictionaryValue> test_json_;
 
   std::string promo_text_;
   std::string promo_text_long_;
diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc
index fa49283..7dcd592 100644
--- a/chrome/browser/web_resource/promo_resource_service_unittest.cc
+++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc
@@ -97,10 +97,10 @@ class NotificationPromoTest {
 
     std::string json_with_end_date(
         ReplaceStringPlaceholders(json, replacements, NULL));
-    Value* value(base::JSONReader::Read(json_with_end_date));
+    base::Value* value(base::JSONReader::Read(json_with_end_date));
     ASSERT_TRUE(value);
 
-    DictionaryValue* dict = NULL;
+    base::DictionaryValue* dict = NULL;
     value->GetAsDictionary(&dict);
     ASSERT_TRUE(dict);
     test_json_.reset(dict);
@@ -339,7 +339,7 @@ class NotificationPromoTest {
  private:
   NotificationPromo notification_promo_;
   bool received_notification_;
-  scoped_ptr<DictionaryValue> test_json_;
+  scoped_ptr<base::DictionaryValue> test_json_;
 
   NotificationPromo::PromoType promo_type_;
   std::string promo_text_;
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index c7282bf..646dd6c 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -44,7 +44,8 @@ WebResourceService::~WebResourceService() {
     EndFetch();
 }
 
-void WebResourceService::OnUnpackFinished(const DictionaryValue& parsed_json) {
+void WebResourceService::OnUnpackFinished(
+    const base::DictionaryValue& parsed_json) {
   Unpack(parsed_json);
   EndFetch();
 }
diff --git a/chrome/browser/web_resource/web_resource_service.h b/chrome/browser/web_resource/web_resource_service.h
index 7acc63a0..8dcbfa4 100644
--- a/chrome/browser/web_resource/web_resource_service.h
+++ b/chrome/browser/web_resource/web_resource_service.h
@@ -46,7 +46,8 @@ class WebResourceService
   void StartAfterDelay();
 
   // JSONAsynchronousUnpackerDelegate methods.
-  virtual void OnUnpackFinished(const DictionaryValue& parsed_json) OVERRIDE;
+  virtual void OnUnpackFinished(
+      const base::DictionaryValue& parsed_json) OVERRIDE;
   virtual void OnUnpackError(const std::string& error_message) OVERRIDE;
 
  protected: