Add base namespace to more values in sync and elsewhere.

google_apis/gaia/google_service_auth_error.cc

 // Copyright (c) 2012 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.
 
 #include "google_apis/gaia/google_service_auth_error.h"
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
@@ skipping 117 matching lines @@
     default:
       NOTREACHED();
   }
   return EmptyString();
 }
 
 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
     STATE_CASE(NONE);
     STATE_CASE(INVALID_GAIA_CREDENTIALS);
     STATE_CASE(USER_NOT_SIGNED_UP);
     STATE_CASE(CONNECTION_FAILED);
     STATE_CASE(CAPTCHA_REQUIRED);
     STATE_CASE(ACCOUNT_DELETED);
     STATE_CASE(ACCOUNT_DISABLED);
     STATE_CASE(SERVICE_UNAVAILABLE);
     STATE_CASE(TWO_FACTOR);
     STATE_CASE(REQUEST_CANCELED);
     STATE_CASE(HOSTED_NOT_ALLOWED);
 #undef STATE_CASE
     default:
       NOTREACHED();
       break;
   }
   value->SetString("state", state_str);
   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());
     captcha_value->SetString("imageUrl", captcha_.image_url.spec());
     captcha_value->SetString("unlockUrl", captcha_.unlock_url.spec());
     captcha_value->SetInteger("imageWidth", captcha_.image_width);
     captcha_value->SetInteger("imageHeight", captcha_.image_height);
   } 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);
     two_factor_value->SetString("alternateText", second_factor_.alternate_text);
     two_factor_value->SetInteger("fieldLength", second_factor_.field_length);
   }
   return value;
 }
 
 std::string GoogleServiceAuthError::ToString() const {
@@ skipping 50 matching lines @@
 GoogleServiceAuthError::GoogleServiceAuthError(
     State s,
     const std::string& captcha_token,
     const std::string& prompt_text,
     const std::string& alternate_text,
     int field_length)
     : state_(s),
       second_factor_(captcha_token, prompt_text, alternate_text, field_length),
       network_error_(0) {
 }