summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 22:23:08 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-23 22:23:08 +0000
commit4b3006f0ecb22cd179404810dc3580ccf5fa129d (patch)
tree84e36a40831bc716becc4e8df5729727b6fe8641 /google_apis
parent85ecd7e2a7efe7fd05d1803412bfe46d8b3bd9d0 (diff)
downloadchromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.zip
chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.gz
chromium_src-4b3006f0ecb22cd179404810dc3580ccf5fa129d.tar.bz2
Update uses of Value in extensions/, google_apis/, gpu/, media/, net/, printing/, remoting/, rlz/, sync/, ui/ to use the base:: namespace.
BUG=88666 TEST=no change TBR=ben@chromium.org Review URL: https://codereview.chromium.org/116433007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/drive/base_requests_unittest.cc2
-rw-r--r--google_apis/gaia/gaia_oauth_client.h2
-rw-r--r--google_apis/gaia/gaia_oauth_client_unittest.cc10
-rw-r--r--google_apis/gaia/google_service_auth_error_unittest.cc6
-rw-r--r--google_apis/gaia/oauth2_mint_token_flow.cc6
-rw-r--r--google_apis/gaia/oauth2_mint_token_flow_unittest.cc4
6 files changed, 15 insertions, 15 deletions
diff --git a/google_apis/drive/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc
index 3032d2a..f3a97c1 100644
--- a/google_apis/drive/base_requests_unittest.cc
+++ b/google_apis/drive/base_requests_unittest.cc
@@ -115,7 +115,7 @@ TEST_F(BaseRequestsTest, ParseValidJson) {
base::Bind(test_util::CreateCopyResultCallback(&json)));
base::RunLoop().RunUntilIdle();
- DictionaryValue* root_dict = NULL;
+ base::DictionaryValue* root_dict = NULL;
ASSERT_TRUE(json);
ASSERT_TRUE(json->GetAsDictionary(&root_dict));
diff --git a/google_apis/gaia/gaia_oauth_client.h b/google_apis/gaia/gaia_oauth_client.h
index 14a26a6..8e01ef6 100644
--- a/google_apis/gaia/gaia_oauth_client.h
+++ b/google_apis/gaia/gaia_oauth_client.h
@@ -49,7 +49,7 @@ class GaiaOAuthClient {
virtual void OnGetUserIdResponse(const std::string& user_id) {}
// Invoked on a successful response to the GetTokenInfo request.
virtual void OnGetTokenInfoResponse(
- scoped_ptr<DictionaryValue> token_info) {}
+ scoped_ptr<base::DictionaryValue> token_info) {}
// Invoked when there is an OAuth error with one of the requests.
virtual void OnOAuthError() = 0;
// Invoked when there is a network error or upon receiving an invalid
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 32e7c66..d4014f7 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -199,15 +199,15 @@ class MockGaiaOAuthClientDelegate : public gaia::GaiaOAuthClient::Delegate {
// override the problematic method to call through to it.
// https://groups.google.com/a/chromium.org/d/msg/chromium-dev/01sDxsJ1OYw/I_S0xCBRF2oJ
MOCK_METHOD1(OnGetTokenInfoResponsePtr,
- void(const DictionaryValue* token_info));
- virtual void OnGetTokenInfoResponse(scoped_ptr<DictionaryValue> token_info)
- OVERRIDE {
+ void(const base::DictionaryValue* token_info));
+ virtual void OnGetTokenInfoResponse(
+ scoped_ptr<base::DictionaryValue> token_info) OVERRIDE {
token_info_.reset(token_info.release());
OnGetTokenInfoResponsePtr(token_info_.get());
}
private:
- scoped_ptr<DictionaryValue> token_info_;
+ scoped_ptr<base::DictionaryValue> token_info_;
DISALLOW_COPY_AND_ASSIGN(MockGaiaOAuthClientDelegate);
};
@@ -328,7 +328,7 @@ TEST_F(GaiaOAuthClientTest, GetUserId) {
}
TEST_F(GaiaOAuthClientTest, GetTokenInfo) {
- const DictionaryValue* captured_result;
+ const base::DictionaryValue* captured_result;
MockGaiaOAuthClientDelegate delegate;
EXPECT_CALL(delegate, OnGetTokenInfoResponsePtr(_))
diff --git a/google_apis/gaia/google_service_auth_error_unittest.cc b/google_apis/gaia/google_service_auth_error_unittest.cc
index d1f920a..8e221cc 100644
--- a/google_apis/gaia/google_service_auth_error_unittest.cc
+++ b/google_apis/gaia/google_service_auth_error_unittest.cc
@@ -20,7 +20,7 @@ class GoogleServiceAuthErrorTest : public testing::Test {};
void TestSimpleState(GoogleServiceAuthError::State state) {
GoogleServiceAuthError error(state);
- scoped_ptr<DictionaryValue> value(error.ToValue());
+ scoped_ptr<base::DictionaryValue> value(error.ToValue());
EXPECT_EQ(1u, value->size());
std::string state_str;
EXPECT_TRUE(value->GetString("state", &state_str));
@@ -38,7 +38,7 @@ TEST_F(GoogleServiceAuthErrorTest, SimpleToValue) {
TEST_F(GoogleServiceAuthErrorTest, None) {
GoogleServiceAuthError error(GoogleServiceAuthError::AuthErrorNone());
- scoped_ptr<DictionaryValue> value(error.ToValue());
+ scoped_ptr<base::DictionaryValue> value(error.ToValue());
EXPECT_EQ(1u, value->size());
ExpectDictStringValue("NONE", *value, "state");
}
@@ -46,7 +46,7 @@ TEST_F(GoogleServiceAuthErrorTest, None) {
TEST_F(GoogleServiceAuthErrorTest, ConnectionFailed) {
GoogleServiceAuthError error(
GoogleServiceAuthError::FromConnectionError(net::OK));
- scoped_ptr<DictionaryValue> value(error.ToValue());
+ scoped_ptr<base::DictionaryValue> value(error.ToValue());
EXPECT_EQ(2u, value->size());
ExpectDictStringValue("CONNECTION_FAILED", *value, "state");
ExpectDictStringValue("net::OK", *value, "networkError");
diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc
index a1e3ff3..94cacde 100644
--- a/google_apis/gaia/oauth2_mint_token_flow.cc
+++ b/google_apis/gaia/oauth2_mint_token_flow.cc
@@ -65,15 +65,15 @@ static GoogleServiceAuthError CreateAuthError(const net::URLFetcher* source) {
std::string response_body;
source->GetResponseAsString(&response_body);
- scoped_ptr<Value> value(base::JSONReader::Read(response_body));
- DictionaryValue* response;
+ scoped_ptr<base::Value> value(base::JSONReader::Read(response_body));
+ base::DictionaryValue* response;
if (!value.get() || !value->GetAsDictionary(&response)) {
return GoogleServiceAuthError::FromUnexpectedServiceResponse(
base::StringPrintf(
"Not able to parse a JSON object from a service response. "
"HTTP Status of the response is: %d", source->GetResponseCode()));
}
- DictionaryValue* error;
+ base::DictionaryValue* error;
if (!response->GetDictionary(kError, &error)) {
return GoogleServiceAuthError::FromUnexpectedServiceResponse(
"Not able to find a detailed error in a service response.");
diff --git a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc
index 7cd3d67..8632f56 100644
--- a/google_apis/gaia/oauth2_mint_token_flow_unittest.cc
+++ b/google_apis/gaia/oauth2_mint_token_flow_unittest.cc
@@ -170,9 +170,9 @@ class OAuth2MintTokenFlowTest : public testing::Test {
// Helper to parse the given string to DictionaryValue.
static base::DictionaryValue* ParseJson(const std::string& str) {
- scoped_ptr<Value> value(base::JSONReader::Read(str));
+ scoped_ptr<base::Value> value(base::JSONReader::Read(str));
EXPECT_TRUE(value.get());
- EXPECT_EQ(Value::TYPE_DICTIONARY, value->GetType());
+ EXPECT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());
return static_cast<base::DictionaryValue*>(value.release());
}