Add base namespace to more values in sync and elsewhere.

This makes sync and net compile with no "using *Value".

BUG=

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

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

5 files changed, 14 insertions, 12 deletions

diff --git a/google_apis/gaia/gaia_auth_fetcher.cc b/google_apis/gaia/gaia_auth_fetcher.cc
index 5f98a28..67756de 100644
--- a/google_apis/gaia/gaia_auth_fetcher.cc
+++ b/google_apis/gaia/gaia_auth_fetcher.cc
@@ -36,7 +36,7 @@ static bool CookiePartsContains(const std::vector<std::string>& parts,
   return std::find(parts.begin(), parts.end(), part) != parts.end();
 }
 
-bool ExtractOAuth2TokenPairResponse(DictionaryValue* dict,
+bool ExtractOAuth2TokenPairResponse(base::DictionaryValue* dict,
                                     std::string* refresh_token,
                                     std::string* access_token,
                                     int* expires_in_secs) {
@@ -820,7 +820,8 @@ void GaiaAuthFetcher::OnOAuth2TokenPairFetched(
   if (status.is_success() && response_code == net::HTTP_OK) {
     scoped_ptr<base::Value> value(base::JSONReader::Read(data));
     if (value.get() && value->GetType() == base::Value::TYPE_DICTIONARY) {
-      DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
+      base::DictionaryValue* dict =
+          static_cast<base::DictionaryValue*>(value.get());
       success = ExtractOAuth2TokenPairResponse(dict, &refresh_token,
                                                &access_token, &expires_in_secs);
     }
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc
index 7b543db..f748fdb 100644
--- a/google_apis/gaia/gaia_oauth_client.cc
+++ b/google_apis/gaia/gaia_oauth_client.cc
@@ -186,15 +186,15 @@ void GaiaOAuthClient::Core::HandleResponse(
     return;
   }
 
-  scoped_ptr<DictionaryValue> response_dict;
+  scoped_ptr<base::DictionaryValue> response_dict;
   if (source->GetResponseCode() == net::HTTP_OK) {
     std::string data;
     source->GetResponseAsString(&data);
-    scoped_ptr<Value> message_value(base::JSONReader::Read(data));
+    scoped_ptr<base::Value> message_value(base::JSONReader::Read(data));
     if (message_value.get() &&
-        message_value->IsType(Value::TYPE_DICTIONARY)) {
+        message_value->IsType(base::Value::TYPE_DICTIONARY)) {
       response_dict.reset(
-          static_cast<DictionaryValue*>(message_value.release()));
+          static_cast<base::DictionaryValue*>(message_value.release()));
     }
   }
 
diff --git a/google_apis/gaia/google_service_auth_error.cc b/google_apis/gaia/google_service_auth_error.cc
index 59569c7..ab3d9c0 100644
--- a/google_apis/gaia/google_service_auth_error.cc
+++ b/google_apis/gaia/google_service_auth_error.cc
@@ -154,8 +154,8 @@ const std::string& GoogleServiceAuthError::error_message() const {
   return error_message_;
 }
 
-DictionaryValue* GoogleServiceAuthError::ToValue() const {
-  DictionaryValue* value = new DictionaryValue();
+base::DictionaryValue* GoogleServiceAuthError::ToValue() const {
+  base::DictionaryValue* value = new base::DictionaryValue();
   std::string state_str;
   switch (state_) {
 #define STATE_CASE(x) case x: state_str = #x; break
@@ -182,7 +182,7 @@ DictionaryValue* GoogleServiceAuthError::ToValue() const {
     value->SetString("errorMessage", error_message_);
   }
   if (state_ == CAPTCHA_REQUIRED) {
-    DictionaryValue* captcha_value = new DictionaryValue();
+    base::DictionaryValue* captcha_value = new base::DictionaryValue();
     value->Set("captcha", captcha_value);
     captcha_value->SetString("token", captcha_.token);
     captcha_value->SetString("audioUrl", captcha_.audio_url.spec());
@@ -193,7 +193,7 @@ DictionaryValue* GoogleServiceAuthError::ToValue() const {
   } else if (state_ == CONNECTION_FAILED) {
     value->SetString("networkError", net::ErrorToString(network_error_));
   } else if (state_ == TWO_FACTOR) {
-    DictionaryValue* two_factor_value = new DictionaryValue();
+    base::DictionaryValue* two_factor_value = new base::DictionaryValue();
     value->Set("two_factor", two_factor_value);
     two_factor_value->SetString("token", second_factor_.token);
     two_factor_value->SetString("promptText", second_factor_.prompt_text);
diff --git a/google_apis/gaia/oauth2_access_token_fetcher.cc b/google_apis/gaia/oauth2_access_token_fetcher.cc
index 39efbf0..e5a17f9 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher.cc
@@ -226,7 +226,8 @@ bool OAuth2AccessTokenFetcher::ParseGetAccessTokenResponse(
   if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY)
     return false;
 
-  DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
+  base::DictionaryValue* dict =
+      static_cast<base::DictionaryValue*>(value.get());
   return dict->GetString(kAccessTokenKey, access_token) &&
       dict->GetInteger(kExpiresInKey, expires_in);
 }
diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc
index f8680e3..0fae02e 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.cc
+++ b/google_apis/gaia/oauth2_mint_token_flow.cc
@@ -178,7 +178,7 @@ void OAuth2MintTokenFlow::ProcessApiCallSuccess(
   std::string response_body;
   source->GetResponseAsString(&response_body);
   scoped_ptr<base::Value> value(base::JSONReader::Read(response_body));
-  DictionaryValue* dict = NULL;
+  base::DictionaryValue* dict = NULL;
   if (!value.get() || !value->GetAsDictionary(&dict)) {
     ReportFailure(GoogleServiceAuthError::FromUnexpectedServiceResponse(
         "Not able to parse a JSON object from a service response."));