diff options
41 files changed, 172 insertions, 162 deletions
diff --git a/extensions/browser/event_router.h b/extensions/browser/event_router.h index d65adb0..7052389 100644 --- a/extensions/browser/event_router.h +++ b/extensions/browser/event_router.h @@ -374,12 +374,12 @@ struct EventListenerInfo { struct EventDispatchInfo { EventDispatchInfo(const std::string& extension_id, const std::string& event_name, - scoped_ptr<ListValue> event_args); + scoped_ptr<base::ListValue> event_args); ~EventDispatchInfo(); const std::string extension_id; const std::string event_name; - scoped_ptr<ListValue> event_args; + scoped_ptr<base::ListValue> event_args; }; } // namespace extensions diff --git a/extensions/browser/extension_function.cc b/extensions/browser/extension_function.cc index d1e2a9f..be5192d 100644 --- a/extensions/browser/extension_function.cc +++ b/extensions/browser/extension_function.cc @@ -136,8 +136,8 @@ bool ExtensionFunction::ShouldSkipQuotaLimiting() const { } bool ExtensionFunction::HasOptionalArgument(size_t index) { - Value* value; - return args_->Get(index, &value) && !value->IsType(Value::TYPE_NULL); + base::Value* value; + return args_->Get(index, &value) && !value->IsType(base::Value::TYPE_NULL); } void ExtensionFunction::SendResponseImpl(bool success) { diff --git a/extensions/browser/info_map_unittest.cc b/extensions/browser/info_map_unittest.cc index 8eaf488..d01fa61 100644 --- a/extensions/browser/info_map_unittest.cc +++ b/extensions/browser/info_map_unittest.cc @@ -38,7 +38,7 @@ static scoped_refptr<Extension> CreateExtension(const std::string& name) { base::FilePath path(FILE_PATH_LITERAL("/foo")); #endif - DictionaryValue manifest; + base::DictionaryValue manifest; manifest.SetString(keys::kVersion, "1.0.0.0"); manifest.SetString(keys::kName, name); @@ -61,7 +61,7 @@ static scoped_refptr<Extension> LoadManifest(const std::string& dir, path = path.AppendASCII("extensions").AppendASCII(dir).AppendASCII(test_file); JSONFileValueSerializer serializer(path); - scoped_ptr<Value> result(serializer.Deserialize(NULL, NULL)); + scoped_ptr<base::Value> result(serializer.Deserialize(NULL, NULL)); if (!result) return NULL; @@ -69,7 +69,7 @@ static scoped_refptr<Extension> LoadManifest(const std::string& dir, scoped_refptr<Extension> extension = Extension::Create(path, Manifest::INVALID_LOCATION, - *static_cast<DictionaryValue*>(result.get()), + *static_cast<base::DictionaryValue*>(result.get()), Extension::NO_FLAGS, &error); EXPECT_TRUE(extension.get()) << error; diff --git a/extensions/common/event_filter_unittest.cc b/extensions/common/event_filter_unittest.cc index 3f7f12b..f95c023 100644 --- a/extensions/common/event_filter_unittest.cc +++ b/extensions/common/event_filter_unittest.cc @@ -10,6 +10,10 @@ #include "ipc/ipc_message.h" #include "testing/gtest/include/gtest/gtest.h" +using base::DictionaryValue; +using base::ListValue; +using base::Value; + namespace extensions { class EventFilterUnittest : public testing::Test { diff --git a/extensions/common/url_pattern_set.cc b/extensions/common/url_pattern_set.cc index db5b4eb..1d29497 100644 --- a/extensions/common/url_pattern_set.cc +++ b/extensions/common/url_pattern_set.cc @@ -183,10 +183,10 @@ bool URLPatternSet::OverlapsWith(const URLPatternSet& other) const { } scoped_ptr<base::ListValue> URLPatternSet::ToValue() const { - scoped_ptr<ListValue> value(new ListValue); + scoped_ptr<base::ListValue> value(new base::ListValue); for (URLPatternSet::const_iterator i = patterns_.begin(); i != patterns_.end(); ++i) - value->AppendIfNotPresent(Value::CreateStringValue(i->GetAsString())); + value->AppendIfNotPresent(base::Value::CreateStringValue(i->GetAsString())); return value.Pass(); } 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()); } diff --git a/gpu/config/gpu_control_list_entry_unittest.cc b/gpu/config/gpu_control_list_entry_unittest.cc index 63cf48e..3c9d385 100644 --- a/gpu/config/gpu_control_list_entry_unittest.cc +++ b/gpu/config/gpu_control_list_entry_unittest.cc @@ -32,7 +32,7 @@ class GpuControlListEntryTest : public testing::Test { const std::string& json, bool supports_feature_type_all) { scoped_ptr<base::Value> root; root.reset(base::JSONReader::Read(json)); - DictionaryValue* value = NULL; + base::DictionaryValue* value = NULL; if (root.get() == NULL || !root->GetAsDictionary(&value)) return NULL; diff --git a/gpu/tools/compositor_model_bench/render_tree.cc b/gpu/tools/compositor_model_bench/render_tree.cc index 8473a3c..52a2150 100644 --- a/gpu/tools/compositor_model_bench/render_tree.cc +++ b/gpu/tools/compositor_model_bench/render_tree.cc @@ -19,7 +19,6 @@ using base::JSONReader; using base::JSONWriter; -using base::Value; using base::ReadFileToString; using std::string; using std::vector; @@ -119,25 +118,25 @@ void RenderNodeVisitor::EndVisitCCNode(CCNode* v) { this->EndVisitRenderNode(v); } -RenderNode* InterpretNode(DictionaryValue* node); +RenderNode* InterpretNode(base::DictionaryValue* node); -std::string ValueTypeAsString(Value::Type type) { +std::string ValueTypeAsString(base::Value::Type type) { switch (type) { - case Value::TYPE_NULL: + case base::Value::TYPE_NULL: return "NULL"; - case Value::TYPE_BOOLEAN: + case base::Value::TYPE_BOOLEAN: return "BOOLEAN"; - case Value::TYPE_INTEGER: + case base::Value::TYPE_INTEGER: return "INTEGER"; - case Value::TYPE_DOUBLE: + case base::Value::TYPE_DOUBLE: return "DOUBLE"; - case Value::TYPE_STRING: + case base::Value::TYPE_STRING: return "STRING"; - case Value::TYPE_BINARY: + case base::Value::TYPE_BINARY: return "BINARY"; - case Value::TYPE_DICTIONARY: + case base::Value::TYPE_DICTIONARY: return "DICTIONARY"; - case Value::TYPE_LIST: + case base::Value::TYPE_LIST: return "LIST"; default: return "(UNKNOWN TYPE)"; @@ -145,15 +144,15 @@ std::string ValueTypeAsString(Value::Type type) { } // Makes sure that the key exists and has the type we expect. -bool VerifyDictionaryEntry(DictionaryValue* node, +bool VerifyDictionaryEntry(base::DictionaryValue* node, const std::string& key, - Value::Type type) { + base::Value::Type type) { if (!node->HasKey(key)) { LOG(ERROR) << "Missing value for key: " << key; return false; } - Value* child; + base::Value* child; node->Get(key, &child); if (!child->IsType(type)) { LOG(ERROR) << key << " did not have the expected type " @@ -165,13 +164,13 @@ bool VerifyDictionaryEntry(DictionaryValue* node, } // Makes sure that the list entry has the type we expect. -bool VerifyListEntry(ListValue* l, +bool VerifyListEntry(base::ListValue* l, int idx, - Value::Type type, + base::Value::Type type, const char* listName = 0) { // Assume the idx is valid (since we'll be able to generate a better // error message for this elsewhere.) - Value* el; + base::Value* el; l->Get(idx, &el); if (!el->IsType(type)) { LOG(ERROR) << (listName ? listName : "List") << "element " << idx << @@ -183,13 +182,14 @@ bool VerifyListEntry(ListValue* l, return true; } -bool InterpretCommonContents(DictionaryValue* node, RenderNode* c) { - if (!VerifyDictionaryEntry(node, "layerID", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(node, "width", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(node, "height", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(node, "drawsContent", Value::TYPE_BOOLEAN) || - !VerifyDictionaryEntry(node, "targetSurfaceID", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(node, "transform", Value::TYPE_LIST) +bool InterpretCommonContents(base::DictionaryValue* node, RenderNode* c) { + if (!VerifyDictionaryEntry(node, "layerID", base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(node, "width", base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(node, "height", base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(node, "drawsContent", base::Value::TYPE_BOOLEAN) || + !VerifyDictionaryEntry(node, "targetSurfaceID", + base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(node, "transform", base::Value::TYPE_LIST) ) { return false; } @@ -210,7 +210,7 @@ bool InterpretCommonContents(DictionaryValue* node, RenderNode* c) { node->GetInteger("targetSurfaceID", &targetSurface); c->set_targetSurface(targetSurface); - ListValue* transform; + base::ListValue* transform; node->GetList("transform", &transform); if (transform->GetSize() != 16) { LOG(ERROR) << "4x4 transform matrix did not have 16 elements"; @@ -218,7 +218,7 @@ bool InterpretCommonContents(DictionaryValue* node, RenderNode* c) { } float transform_mat[16]; for (int i = 0; i < 16; ++i) { - if (!VerifyListEntry(transform, i, Value::TYPE_DOUBLE, "Transform")) + if (!VerifyListEntry(transform, i, base::Value::TYPE_DOUBLE, "Transform")) return false; double el; transform->GetDouble(i, &el); @@ -227,16 +227,16 @@ bool InterpretCommonContents(DictionaryValue* node, RenderNode* c) { c->set_transform(transform_mat); if (node->HasKey("tiles")) { - if (!VerifyDictionaryEntry(node, "tiles", Value::TYPE_DICTIONARY)) + if (!VerifyDictionaryEntry(node, "tiles", base::Value::TYPE_DICTIONARY)) return false; - DictionaryValue* tiles_dict; + base::DictionaryValue* tiles_dict; node->GetDictionary("tiles", &tiles_dict); - if (!VerifyDictionaryEntry(tiles_dict, "dim", Value::TYPE_LIST)) + if (!VerifyDictionaryEntry(tiles_dict, "dim", base::Value::TYPE_LIST)) return false; - ListValue* dim; + base::ListValue* dim; tiles_dict->GetList("dim", &dim); - if (!VerifyListEntry(dim, 0, Value::TYPE_INTEGER, "Tile dimension") || - !VerifyListEntry(dim, 1, Value::TYPE_INTEGER, "Tile dimension")) { + if (!VerifyListEntry(dim, 0, base::Value::TYPE_INTEGER, "Tile dimension") || + !VerifyListEntry(dim, 1, base::Value::TYPE_INTEGER, "Tile dimension")) { return false; } int tile_width; @@ -246,25 +246,25 @@ bool InterpretCommonContents(DictionaryValue* node, RenderNode* c) { dim->GetInteger(1, &tile_height); c->set_tile_height(tile_height); - if (!VerifyDictionaryEntry(tiles_dict, "info", Value::TYPE_LIST)) + if (!VerifyDictionaryEntry(tiles_dict, "info", base::Value::TYPE_LIST)) return false; - ListValue* tiles; + base::ListValue* tiles; tiles_dict->GetList("info", &tiles); for (unsigned int i = 0; i < tiles->GetSize(); ++i) { - if (!VerifyListEntry(tiles, i, Value::TYPE_DICTIONARY, "Tile info")) + if (!VerifyListEntry(tiles, i, base::Value::TYPE_DICTIONARY, "Tile info")) return false; - DictionaryValue* tdict; + base::DictionaryValue* tdict; tiles->GetDictionary(i, &tdict); - if (!VerifyDictionaryEntry(tdict, "x", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(tdict, "y", Value::TYPE_INTEGER)) { + if (!VerifyDictionaryEntry(tdict, "x", base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(tdict, "y", base::Value::TYPE_INTEGER)) { return false; } Tile t; tdict->GetInteger("x", &t.x); tdict->GetInteger("y", &t.y); if (tdict->HasKey("texID")) { - if (!VerifyDictionaryEntry(tdict, "texID", Value::TYPE_INTEGER)) + if (!VerifyDictionaryEntry(tdict, "texID", base::Value::TYPE_INTEGER)) return false; tdict->GetInteger("texID", &t.texID); } else { @@ -276,10 +276,11 @@ bool InterpretCommonContents(DictionaryValue* node, RenderNode* c) { return true; } -bool InterpretCCData(DictionaryValue* node, CCNode* c) { - if (!VerifyDictionaryEntry(node, "vertex_shader", Value::TYPE_STRING) || - !VerifyDictionaryEntry(node, "fragment_shader", Value::TYPE_STRING) || - !VerifyDictionaryEntry(node, "textures", Value::TYPE_LIST)) { +bool InterpretCCData(base::DictionaryValue* node, CCNode* c) { + if (!VerifyDictionaryEntry(node, "vertex_shader", base::Value::TYPE_STRING) || + !VerifyDictionaryEntry(node, "fragment_shader", + base::Value::TYPE_STRING) || + !VerifyDictionaryEntry(node, "textures", base::Value::TYPE_LIST)) { return false; } string vertex_shader_name, fragment_shader_name; @@ -288,18 +289,18 @@ bool InterpretCCData(DictionaryValue* node, CCNode* c) { c->set_vertex_shader(ShaderIDFromString(vertex_shader_name)); c->set_fragment_shader(ShaderIDFromString(fragment_shader_name)); - ListValue* textures; + base::ListValue* textures; node->GetList("textures", &textures); for (unsigned int i = 0; i < textures->GetSize(); ++i) { - if (!VerifyListEntry(textures, i, Value::TYPE_DICTIONARY, "Tex list")) + if (!VerifyListEntry(textures, i, base::Value::TYPE_DICTIONARY, "Tex list")) return false; - DictionaryValue* tex; + base::DictionaryValue* tex; textures->GetDictionary(i, &tex); - if (!VerifyDictionaryEntry(tex, "texID", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(tex, "height", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(tex, "width", Value::TYPE_INTEGER) || - !VerifyDictionaryEntry(tex, "format", Value::TYPE_STRING)) { + if (!VerifyDictionaryEntry(tex, "texID", base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(tex, "height", base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(tex, "width", base::Value::TYPE_INTEGER) || + !VerifyDictionaryEntry(tex, "format", base::Value::TYPE_STRING)) { return false; } Texture t; @@ -335,14 +336,14 @@ bool InterpretCCData(DictionaryValue* node, CCNode* c) { return true; } -RenderNode* InterpretContentLayer(DictionaryValue* node) { +RenderNode* InterpretContentLayer(base::DictionaryValue* node) { ContentLayerNode* n = new ContentLayerNode; if (!InterpretCommonContents(node, n)) return NULL; - if (!VerifyDictionaryEntry(node, "type", Value::TYPE_STRING) || - !VerifyDictionaryEntry(node, "skipsDraw", Value::TYPE_BOOLEAN) || - !VerifyDictionaryEntry(node, "children", Value::TYPE_LIST)) { + if (!VerifyDictionaryEntry(node, "type", base::Value::TYPE_STRING) || + !VerifyDictionaryEntry(node, "skipsDraw", base::Value::TYPE_BOOLEAN) || + !VerifyDictionaryEntry(node, "children", base::Value::TYPE_LIST)) { return NULL; } @@ -353,10 +354,10 @@ RenderNode* InterpretContentLayer(DictionaryValue* node) { node->GetBoolean("skipsDraw", &skipsDraw); n->set_skipsDraw(skipsDraw); - ListValue* children; + base::ListValue* children; node->GetList("children", &children); for (unsigned int i = 0; i < children->GetSize(); ++i) { - DictionaryValue* childNode; + base::DictionaryValue* childNode; children->GetDictionary(i, &childNode); RenderNode* child = InterpretNode(childNode); if (child) @@ -366,12 +367,12 @@ RenderNode* InterpretContentLayer(DictionaryValue* node) { return n; } -RenderNode* InterpretCanvasLayer(DictionaryValue* node) { +RenderNode* InterpretCanvasLayer(base::DictionaryValue* node) { CCNode* n = new CCNode; if (!InterpretCommonContents(node, n)) return NULL; - if (!VerifyDictionaryEntry(node, "type", Value::TYPE_STRING)) { + if (!VerifyDictionaryEntry(node, "type", base::Value::TYPE_STRING)) { return NULL; } @@ -385,12 +386,12 @@ RenderNode* InterpretCanvasLayer(DictionaryValue* node) { return n; } -RenderNode* InterpretVideoLayer(DictionaryValue* node) { +RenderNode* InterpretVideoLayer(base::DictionaryValue* node) { CCNode* n = new CCNode; if (!InterpretCommonContents(node, n)) return NULL; - if (!VerifyDictionaryEntry(node, "type", Value::TYPE_STRING)) { + if (!VerifyDictionaryEntry(node, "type", base::Value::TYPE_STRING)) { return NULL; } @@ -404,12 +405,12 @@ RenderNode* InterpretVideoLayer(DictionaryValue* node) { return n; } -RenderNode* InterpretImageLayer(DictionaryValue* node) { +RenderNode* InterpretImageLayer(base::DictionaryValue* node) { CCNode* n = new CCNode; if (!InterpretCommonContents(node, n)) return NULL; - if (!VerifyDictionaryEntry(node, "type", Value::TYPE_STRING)) { + if (!VerifyDictionaryEntry(node, "type", base::Value::TYPE_STRING)) { return NULL; } @@ -423,8 +424,8 @@ RenderNode* InterpretImageLayer(DictionaryValue* node) { return n; } -RenderNode* InterpretNode(DictionaryValue* node) { - if (!VerifyDictionaryEntry(node, "type", Value::TYPE_STRING)) { +RenderNode* InterpretNode(base::DictionaryValue* node) { + if (!VerifyDictionaryEntry(node, "type", base::Value::TYPE_STRING)) { return NULL; } @@ -457,7 +458,7 @@ RenderNode* BuildRenderTreeFromFile(const base::FilePath& path) { if (!ReadFileToString(path, &contents)) return NULL; - scoped_ptr<Value> root; + scoped_ptr<base::Value> root; int error_code = 0; string error_message; root.reset(JSONReader::ReadAndReturnError(contents, @@ -470,8 +471,8 @@ RenderNode* BuildRenderTreeFromFile(const base::FilePath& path) { return NULL; } - if (root->IsType(Value::TYPE_DICTIONARY)) { - DictionaryValue* v = static_cast<DictionaryValue*>(root.get()); + if (root->IsType(base::Value::TYPE_DICTIONARY)) { + base::DictionaryValue* v = static_cast<base::DictionaryValue*>(root.get()); RenderNode* tree = InterpretContentLayer(v); return tree; } else { diff --git a/media/cdm/json_web_key.cc b/media/cdm/json_web_key.cc index 522f1c9..a6aa885 100644 --- a/media/cdm/json_web_key.cc +++ b/media/cdm/json_web_key.cc @@ -81,7 +81,7 @@ std::string GenerateJWKSet(const uint8* key, int key_length, // Processes a JSON Web Key to extract the key id and key value. Sets |jwk_key| // to the id/value pair and returns true on success. -static bool ConvertJwkToKeyPair(const DictionaryValue& jwk, +static bool ConvertJwkToKeyPair(const base::DictionaryValue& jwk, KeyIdAndKeyPair* jwk_key) { // Have found a JWK, start by checking that it is a symmetric key. std::string type; @@ -124,13 +124,14 @@ bool ExtractKeysFromJWKSet(const std::string& jwk_set, KeyIdAndKeyPairs* keys) { if (!IsStringASCII(jwk_set)) return false; - scoped_ptr<Value> root(base::JSONReader().ReadToValue(jwk_set)); - if (!root.get() || root->GetType() != Value::TYPE_DICTIONARY) + scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(jwk_set)); + if (!root.get() || root->GetType() != base::Value::TYPE_DICTIONARY) return false; // Locate the set from the dictionary. - DictionaryValue* dictionary = static_cast<DictionaryValue*>(root.get()); - ListValue* list_val = NULL; + base::DictionaryValue* dictionary = + static_cast<base::DictionaryValue*>(root.get()); + base::ListValue* list_val = NULL; if (!dictionary->GetList(kKeysTag, &list_val)) { DVLOG(1) << "Missing '" << kKeysTag << "' parameter or not a list in JWK Set"; @@ -141,7 +142,7 @@ bool ExtractKeysFromJWKSet(const std::string& jwk_set, KeyIdAndKeyPairs* keys) { // success. KeyIdAndKeyPairs local_keys; for (size_t i = 0; i < list_val->GetSize(); ++i) { - DictionaryValue* jwk = NULL; + base::DictionaryValue* jwk = NULL; if (!list_val->GetDictionary(i, &jwk)) { DVLOG(1) << "Unable to access '" << kKeysTag << "'[" << i << "] in JWK Set"; diff --git a/net/base/capturing_net_log.cc b/net/base/capturing_net_log.cc index c7c2516..ea17835 100644 --- a/net/base/capturing_net_log.cc +++ b/net/base/capturing_net_log.cc @@ -106,7 +106,7 @@ void CapturingNetLog::Observer::OnAddEntry(const net::NetLog::Entry& entry) { // Using Dictionaries instead of Values makes checking values a little // simpler. base::DictionaryValue* param_dict = NULL; - Value* param_value = entry.ParametersToValue(); + base::Value* param_value = entry.ParametersToValue(); if (param_value && !param_value->GetAsDictionary(¶m_dict)) delete param_value; diff --git a/net/base/net_log_logger.cc b/net/base/net_log_logger.cc index bd68bd5..0fcf417 100644 --- a/net/base/net_log_logger.cc +++ b/net/base/net_log_logger.cc @@ -52,7 +52,7 @@ void NetLogLogger::OnAddEntry(const net::NetLog::Entry& entry) { // Add a comma and newline for every event but the first. Newlines are needed // so can load partial log files by just ignoring the last line. For this to // work, lines cannot be pretty printed. - scoped_ptr<Value> value(entry.ToValue()); + scoped_ptr<base::Value> value(entry.ToValue()); std::string json; base::JSONWriter::Write(value.get(), &json); fprintf(file_.get(), "%s%s", @@ -62,7 +62,7 @@ void NetLogLogger::OnAddEntry(const net::NetLog::Entry& entry) { } base::DictionaryValue* NetLogLogger::GetConstants() { - DictionaryValue* constants_dict = new DictionaryValue(); + base::DictionaryValue* constants_dict = new base::DictionaryValue(); // Version of the file format. constants_dict->SetInteger("logFormatVersion", kLogFormatVersion); @@ -74,7 +74,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Add a dictionary with information about the relationship between load flag // enums and their symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); #define LOAD_FLAG(label, value) \ dict->SetInteger(# label, static_cast<int>(value)); @@ -87,7 +87,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Add a dictionary with information about the relationship between load state // enums and their symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); #define LOAD_STATE(label) \ dict->SetInteger(# label, net::LOAD_STATE_ ## label); @@ -100,7 +100,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Add information on the relationship between net error codes and their // symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); #define NET_ERROR(label, value) \ dict->SetInteger(# label, static_cast<int>(value)); @@ -113,7 +113,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Add information on the relationship between QUIC error codes and their // symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); for (net::QuicErrorCode error = net::QUIC_NO_ERROR; error < net::QUIC_LAST_ERROR; @@ -128,7 +128,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Add information on the relationship between QUIC RST_STREAM error codes // and their symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); for (net::QuicRstStreamErrorCode error = net::QUIC_STREAM_NO_ERROR; error < net::QUIC_STREAM_LAST_ERROR; @@ -143,7 +143,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Information about the relationship between event phase enums and their // symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetInteger("PHASE_BEGIN", net::NetLog::PHASE_BEGIN); dict->SetInteger("PHASE_END", net::NetLog::PHASE_END); @@ -159,7 +159,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Information about the relationship between LogLevel enums and their // symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetInteger("LOG_ALL", net::NetLog::LOG_ALL); dict->SetInteger("LOG_ALL_BUT_BYTES", net::NetLog::LOG_ALL_BUT_BYTES); @@ -171,7 +171,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // Information about the relationship between address family enums and // their symbolic names. { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetInteger("ADDRESS_FAMILY_UNSPECIFIED", net::ADDRESS_FAMILY_UNSPECIFIED); @@ -209,7 +209,7 @@ base::DictionaryValue* NetLogLogger::GetConstants() { // "clientInfo" key is required for some NetLogLogger log readers. // Provide a default empty value for compatibility. - constants_dict->Set("clientInfo", new DictionaryValue()); + constants_dict->Set("clientInfo", new base::DictionaryValue()); return constants_dict; } diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc index 39ac8df..d93291f 100644 --- a/net/http/transport_security_persister.cc +++ b/net/http/transport_security_persister.cc @@ -26,14 +26,15 @@ using net::TransportSecurityState; namespace { -ListValue* SPKIHashesToListValue(const HashValueVector& hashes) { - ListValue* pins = new ListValue; +base::ListValue* SPKIHashesToListValue(const HashValueVector& hashes) { + base::ListValue* pins = new base::ListValue; for (size_t i = 0; i != hashes.size(); i++) - pins->Append(new StringValue(hashes[i].ToString())); + pins->Append(new base::StringValue(hashes[i].ToString())); return pins; } -void SPKIHashesFromListValue(const ListValue& pins, HashValueVector* hashes) { +void SPKIHashesFromListValue(const base::ListValue& pins, + HashValueVector* hashes) { size_t num_pins = pins.GetSize(); for (size_t i = 0; i < num_pins; ++i) { std::string type_and_base64; @@ -137,7 +138,7 @@ void TransportSecurityPersister::StateIsDirty( bool TransportSecurityPersister::SerializeData(std::string* output) { DCHECK(foreground_runner_->RunsTasksOnCurrentThread()); - DictionaryValue toplevel; + base::DictionaryValue toplevel; base::Time now = base::Time::Now(); TransportSecurityState::Iterator state(*transport_security_state_); for (; state.HasNext(); state.Advance()) { @@ -145,7 +146,7 @@ bool TransportSecurityPersister::SerializeData(std::string* output) { const TransportSecurityState::DomainState& domain_state = state.domain_state(); - DictionaryValue* serialized = new DictionaryValue; + base::DictionaryValue* serialized = new base::DictionaryValue; serialized->SetBoolean(kStsIncludeSubdomains, domain_state.sts_include_subdomains); serialized->SetBoolean(kPkpIncludeSubdomains, @@ -198,16 +199,17 @@ bool TransportSecurityPersister::LoadEntries(const std::string& serialized, bool TransportSecurityPersister::Deserialize(const std::string& serialized, bool* dirty, TransportSecurityState* state) { - scoped_ptr<Value> value(base::JSONReader::Read(serialized)); - DictionaryValue* dict_value = NULL; + scoped_ptr<base::Value> value(base::JSONReader::Read(serialized)); + base::DictionaryValue* dict_value = NULL; if (!value.get() || !value->GetAsDictionary(&dict_value)) return false; const base::Time current_time(base::Time::Now()); bool dirtied = false; - for (DictionaryValue::Iterator i(*dict_value); !i.IsAtEnd(); i.Advance()) { - const DictionaryValue* parsed = NULL; + for (base::DictionaryValue::Iterator i(*dict_value); + !i.IsAtEnd(); i.Advance()) { + const base::DictionaryValue* parsed = NULL; if (!i.value().GetAsDictionary(&parsed)) { LOG(WARNING) << "Could not parse entry " << i.key() << "; skipping entry"; continue; @@ -247,7 +249,7 @@ bool TransportSecurityPersister::Deserialize(const std::string& serialized, parsed->GetDouble(kDynamicSPKIHashesExpiry, &dynamic_spki_hashes_expiry); - const ListValue* pins_list = NULL; + const base::ListValue* pins_list = NULL; // preloaded_spki_hashes is a legacy synonym for static_spki_hashes. if (parsed->GetList(kStaticSPKIHashes, &pins_list)) SPKIHashesFromListValue(*pins_list, &domain_state.static_spki_hashes); diff --git a/net/spdy/spdy_header_block_unittest.cc b/net/spdy/spdy_header_block_unittest.cc index 3cfef16..1b6b449d 100644 --- a/net/spdy/spdy_header_block_unittest.cc +++ b/net/spdy/spdy_header_block_unittest.cc @@ -18,7 +18,7 @@ TEST(SpdyHeaderBlockTest, ToNetLogParamAndBackAgain) { headers["A"] = "a"; headers["B"] = "b"; - scoped_ptr<Value> event_param( + scoped_ptr<base::Value> event_param( SpdyHeaderBlockNetLogCallback(&headers, NetLog::LOG_ALL_BUT_BYTES)); SpdyHeaderBlock headers2; diff --git a/net/test/spawned_test_server/local_test_server.cc b/net/test/spawned_test_server/local_test_server.cc index 8679d7b..7ee12b9 100644 --- a/net/test/spawned_test_server/local_test_server.cc +++ b/net/test/spawned_test_server/local_test_server.cc @@ -35,7 +35,7 @@ bool AppendArgumentFromJSONValue(const std::string& key, command_line->AppendArg(argument_name + "=" + base::IntToString(value)); break; } - case Value::TYPE_STRING: { + case base::Value::TYPE_STRING: { std::string value; bool result = value_node.GetAsString(&value); if (!result || value.empty()) @@ -210,7 +210,7 @@ bool LocalTestServer::AddCommandLineArguments(CommandLine* command_line) const { const std::string& key = it.key(); // Add arguments from a list. - if (value.IsType(Value::TYPE_LIST)) { + if (value.IsType(base::Value::TYPE_LIST)) { const base::ListValue* list = NULL; if (!value.GetAsList(&list) || !list || list->empty()) return false; diff --git a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc index f9caa79..d77abee 100644 --- a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc +++ b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc @@ -58,7 +58,7 @@ bool ReadTestCase(const char* filename, return false; } - scoped_ptr<Value> value(base::JSONReader::Read(json)); + scoped_ptr<base::Value> value(base::JSONReader::Read(json)); if (!value.get()) { LOG(ERROR) << filename << ": couldn't parse JSON."; return false; diff --git a/net/tools/gdig/file_net_log.cc b/net/tools/gdig/file_net_log.cc index 7c755c8..5020f6d 100644 --- a/net/tools/gdig/file_net_log.cc +++ b/net/tools/gdig/file_net_log.cc @@ -27,7 +27,7 @@ void FileNetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { const char* source = NetLog::SourceTypeToString(entry.source().type); const char* type = NetLog::EventTypeToString(entry.type()); - scoped_ptr<Value> param_value(entry.ParametersToValue()); + scoped_ptr<base::Value> param_value(entry.ParametersToValue()); std::string params; if (param_value.get() != NULL) { JSONStringValueSerializer serializer(¶ms); diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index a037063..f9dec87 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -361,11 +361,11 @@ LoadStateWithParam URLRequest::GetLoadState() const { } base::Value* URLRequest::GetStateAsValue() const { - DictionaryValue* dict = new DictionaryValue(); + base::DictionaryValue* dict = new base::DictionaryValue(); dict->SetString("url", original_url().possibly_invalid_spec()); if (url_chain_.size() > 1) { - ListValue* list = new ListValue(); + base::ListValue* list = new base::ListValue(); for (std::vector<GURL>::const_iterator url = url_chain_.begin(); url != url_chain_.end(); ++url) { list->AppendString(url->possibly_invalid_spec()); diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc index fdc3b7f..c73e537 100644 --- a/printing/backend/print_backend_dummy.cc +++ b/printing/backend/print_backend_dummy.cc @@ -14,7 +14,7 @@ namespace printing { scoped_refptr<PrintBackend> PrintBackend::CreateInstance( - const DictionaryValue* print_backend_settings) { + const base::DictionaryValue* print_backend_settings) { NOTREACHED(); return NULL; } diff --git a/remoting/base/vlog_net_log.cc b/remoting/base/vlog_net_log.cc index ff2e3e3..aee63b8 100644 --- a/remoting/base/vlog_net_log.cc +++ b/remoting/base/vlog_net_log.cc @@ -33,7 +33,7 @@ VlogNetLog::Observer::~Observer() { void VlogNetLog::Observer::OnAddEntry(const net::NetLog::Entry& entry) { if (VLOG_IS_ON(4)) { - scoped_ptr<Value> value(entry.ToValue()); + scoped_ptr<base::Value> value(entry.ToValue()); std::string json; base::JSONWriter::Write(value.get(), &json); VLOG(4) << json; diff --git a/remoting/host/json_host_config.cc b/remoting/host/json_host_config.cc index 0a8db7c..7cd35f4 100644 --- a/remoting/host/json_host_config.cc +++ b/remoting/host/json_host_config.cc @@ -48,14 +48,15 @@ std::string JsonHostConfig::GetSerializedData() { } bool JsonHostConfig::SetSerializedData(const std::string& config) { - scoped_ptr<Value> value( + scoped_ptr<base::Value> value( base::JSONReader::Read(config, base::JSON_ALLOW_TRAILING_COMMAS)); - if (value.get() == NULL || !value->IsType(Value::TYPE_DICTIONARY)) { + if (value.get() == NULL || !value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(WARNING) << "Failed to parse " << filename_.value(); return false; } - DictionaryValue* dictionary = static_cast<DictionaryValue*>(value.release()); + base::DictionaryValue* dictionary = + static_cast<base::DictionaryValue*>(value.release()); values_.reset(dictionary); return true; } diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc index da57f68..37ed8a0 100644 --- a/remoting/host/policy_hack/policy_watcher_linux.cc +++ b/remoting/host/policy_hack/policy_watcher_linux.cc @@ -126,7 +126,7 @@ class PolicyWatcherLinux : public PolicyWatcher { } // Returns NULL if the policy dictionary couldn't be read. - scoped_ptr<DictionaryValue> Load() { + scoped_ptr<base::DictionaryValue> Load() { DCHECK(OnPolicyWatcherThread()); // Enumerate the files and sort them lexicographically. std::set<base::FilePath> files; @@ -137,26 +137,26 @@ class PolicyWatcherLinux : public PolicyWatcher { files.insert(config_file_path); // Start with an empty dictionary and merge the files' contents. - scoped_ptr<DictionaryValue> policy(new DictionaryValue()); + scoped_ptr<base::DictionaryValue> policy(new base::DictionaryValue()); for (std::set<base::FilePath>::iterator config_file_iter = files.begin(); config_file_iter != files.end(); ++config_file_iter) { JSONFileValueSerializer deserializer(*config_file_iter); deserializer.set_allow_trailing_comma(true); int error_code = 0; std::string error_msg; - scoped_ptr<Value> value( + scoped_ptr<base::Value> value( deserializer.Deserialize(&error_code, &error_msg)); if (!value.get()) { LOG(WARNING) << "Failed to read configuration file " << config_file_iter->value() << ": " << error_msg; - return scoped_ptr<DictionaryValue>(); + return scoped_ptr<base::DictionaryValue>(); } - if (!value->IsType(Value::TYPE_DICTIONARY)) { + if (!value->IsType(base::Value::TYPE_DICTIONARY)) { LOG(WARNING) << "Expected JSON dictionary in configuration file " << config_file_iter->value(); - return scoped_ptr<DictionaryValue>(); + return scoped_ptr<base::DictionaryValue>(); } - policy->MergeDictionary(static_cast<DictionaryValue*>(value.get())); + policy->MergeDictionary(static_cast<base::DictionaryValue*>(value.get())); } return policy.Pass(); @@ -179,7 +179,7 @@ class PolicyWatcherLinux : public PolicyWatcher { } // Load the policy definitions. - scoped_ptr<DictionaryValue> new_policy = Load(); + scoped_ptr<base::DictionaryValue> new_policy = Load(); if (new_policy.get()) { UpdatePolicies(new_policy.get()); ScheduleFallbackReloadTask(); diff --git a/remoting/host/policy_hack/policy_watcher_win.cc b/remoting/host/policy_hack/policy_watcher_win.cc index 7216b58..83f67430 100644 --- a/remoting/host/policy_hack/policy_watcher_win.cc +++ b/remoting/host/policy_hack/policy_watcher_win.cc @@ -194,7 +194,7 @@ class PolicyWatcherWin : void Reload() { DCHECK(OnPolicyWatcherThread()); SetupWatches(); - scoped_ptr<DictionaryValue> new_policy(Load()); + scoped_ptr<base::DictionaryValue> new_policy(Load()); UpdatePolicies(new_policy.get()); } diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc index 67fcaa7..025642e 100644 --- a/remoting/host/setup/me2me_native_messaging_host.cc +++ b/remoting/host/setup/me2me_native_messaging_host.cc @@ -400,7 +400,7 @@ void Me2MeNativeMessagingHost::SendConfigResponse( if (config) { response->Set("config", config.release()); } else { - response->Set("config", Value::CreateNullValue()); + response->Set("config", base::Value::CreateNullValue()); } channel_->SendMessage(response.Pass()); } diff --git a/remoting/host/setup/service_client.cc b/remoting/host/setup/service_client.cc index 43f24ca..0e7996c 100644 --- a/remoting/host/setup/service_client.cc +++ b/remoting/host/setup/service_client.cc @@ -145,11 +145,11 @@ void ServiceClient::Core::HandleResponse(const net::URLFetcher* source) { { std::string data; source->GetResponseAsString(&data); - scoped_ptr<Value> message_value(base::JSONReader::Read(data)); - DictionaryValue *dict; + scoped_ptr<base::Value> message_value(base::JSONReader::Read(data)); + base::DictionaryValue *dict; std::string code; if (message_value.get() && - message_value->IsType(Value::TYPE_DICTIONARY) && + message_value->IsType(base::Value::TYPE_DICTIONARY) && message_value->GetAsDictionary(&dict) && dict->GetString("data.authorizationCode", &code)) { delegate_->OnHostRegistered(code); diff --git a/remoting/host/token_validator_factory_impl.cc b/remoting/host/token_validator_factory_impl.cc index d93df62..8d536a6 100644 --- a/remoting/host/token_validator_factory_impl.cc +++ b/remoting/host/token_validator_factory_impl.cc @@ -131,7 +131,7 @@ class TokenValidatorImpl // Decode the JSON data from the response. scoped_ptr<base::Value> value(base::JSONReader::Read(data)); - DictionaryValue* dict; + base::DictionaryValue* dict; if (!value.get() || value->GetType() != base::Value::TYPE_DICTIONARY || !value->GetAsDictionary(&dict)) { LOG(ERROR) << "Invalid token validation response: '" << data << "'"; diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc index 8737917..18208fa 100644 --- a/remoting/host/token_validator_factory_impl_unittest.cc +++ b/remoting/host/token_validator_factory_impl_unittest.cc @@ -66,7 +66,7 @@ class TokenValidatorFactoryImplTest : public testing::Test { } static std::string CreateResponse(const std::string& scope) { - DictionaryValue response_dict; + base::DictionaryValue response_dict; response_dict.SetString("access_token", kSharedSecret); response_dict.SetString("token_type", "shared_secret"); response_dict.SetString("scope", scope); @@ -76,7 +76,7 @@ class TokenValidatorFactoryImplTest : public testing::Test { } static std::string CreateErrorResponse(const std::string& error) { - DictionaryValue response_dict; + base::DictionaryValue response_dict; response_dict.SetString("error", error); std::string response; base::JSONWriter::Write(&response_dict, &response); diff --git a/remoting/protocol/pairing_registry.cc b/remoting/protocol/pairing_registry.cc index f1ce333..e33b59d 100644 --- a/remoting/protocol/pairing_registry.cc +++ b/remoting/protocol/pairing_registry.cc @@ -256,7 +256,7 @@ void PairingRegistry::SanitizePairings(const GetAllPairingsCallback& callback, scoped_ptr<base::ListValue> sanitized_pairings(new base::ListValue()); for (size_t i = 0; i < pairings->GetSize(); ++i) { - DictionaryValue* pairing_json; + base::DictionaryValue* pairing_json; if (!pairings->GetDictionary(i, &pairing_json)) { LOG(WARNING) << "A pairing entry is not a dictionary."; continue; diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc index 06e4a54..7fe5fdb 100644 --- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc +++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc @@ -225,7 +225,8 @@ void RlzValueStoreChromeOS::WriteStore() { std::string json_data; JSONStringValueSerializer serializer(&json_data); serializer.set_pretty_print(true); - scoped_ptr<DictionaryValue> copy(rlz_store_->DeepCopyWithoutEmptyChildren()); + scoped_ptr<base::DictionaryValue> copy( + rlz_store_->DeepCopyWithoutEmptyChildren()); if (!serializer.Serialize(*copy.get())) { LOG(ERROR) << "Failed to serialize RLZ data"; NOTREACHED(); diff --git a/sync/notifier/object_id_invalidation_map.cc b/sync/notifier/object_id_invalidation_map.cc index 1082eaa..02b5a21 100644 --- a/sync/notifier/object_id_invalidation_map.cc +++ b/sync/notifier/object_id_invalidation_map.cc @@ -94,7 +94,7 @@ scoped_ptr<base::ListValue> ObjectIdInvalidationMap::ToValue() const { bool ObjectIdInvalidationMap::ResetFromValue(const base::ListValue& value) { map_.clear(); for (size_t i = 0; i < value.GetSize(); ++i) { - const DictionaryValue* dict; + const base::DictionaryValue* dict; if (!value.GetDictionary(i, &dict)) { return false; } diff --git a/sync/notifier/single_object_invalidation_set.cc b/sync/notifier/single_object_invalidation_set.cc index b204c64..93b47ab 100644 --- a/sync/notifier/single_object_invalidation_set.cc +++ b/sync/notifier/single_object_invalidation_set.cc @@ -86,7 +86,7 @@ const Invalidation& SingleObjectInvalidationSet::back() const { } scoped_ptr<base::ListValue> SingleObjectInvalidationSet::ToValue() const { - scoped_ptr<base::ListValue> value(new ListValue); + scoped_ptr<base::ListValue> value(new base::ListValue); for (InvalidationsSet::const_iterator it = invalidations_.begin(); it != invalidations_.end(); ++it) { value->Append(it->ToValue().release()); diff --git a/sync/notifier/unacked_invalidation_set.cc b/sync/notifier/unacked_invalidation_set.cc index 705dbd2..6991fc0 100644 --- a/sync/notifier/unacked_invalidation_set.cc +++ b/sync/notifier/unacked_invalidation_set.cc @@ -123,7 +123,7 @@ scoped_ptr<base::DictionaryValue> UnackedInvalidationSet::ToValue() const { value->SetString(kSourceKey, base::IntToString(object_id_.source())); value->SetString(kNameKey, object_id_.name()); - scoped_ptr<base::ListValue> list_value(new ListValue); + scoped_ptr<base::ListValue> list_value(new base::ListValue); for (InvalidationsSet::const_iterator it = invalidations_.begin(); it != invalidations_.end(); ++it) { list_value->Append(it->ToValue().release()); diff --git a/sync/syncable/model_type_unittest.cc b/sync/syncable/model_type_unittest.cc index 737aea3..fac7fda 100644 --- a/sync/syncable/model_type_unittest.cc +++ b/sync/syncable/model_type_unittest.cc @@ -31,7 +31,7 @@ TEST_F(ModelTypeTest, ModelTypeToValue) { TEST_F(ModelTypeTest, ModelTypeFromValue) { for (int i = FIRST_REAL_MODEL_TYPE; i < MODEL_TYPE_COUNT; ++i) { ModelType model_type = ModelTypeFromInt(i); - scoped_ptr<StringValue> value(ModelTypeToValue(model_type)); + scoped_ptr<base::StringValue> value(ModelTypeToValue(model_type)); EXPECT_EQ(model_type, ModelTypeFromValue(*value)); } } diff --git a/sync/test/accounts_client/test_accounts_client.cc b/sync/test/accounts_client/test_accounts_client.cc index 25f7ba8..9520bcf 100644 --- a/sync/test/accounts_client/test_accounts_client.cc +++ b/sync/test/accounts_client/test_accounts_client.cc @@ -95,7 +95,7 @@ bool TestAccountsClient::ClaimAccount(AccountSession* session) { return false; } - scoped_ptr<Value> value(base::JSONReader::Read(response)); + scoped_ptr<base::Value> value(base::JSONReader::Read(response)); base::DictionaryValue* dict_value; if (value != NULL && value->GetAsDictionary(&dict_value) && dict_value != NULL) { diff --git a/sync/test/accounts_client/test_accounts_client_unittest.cc b/sync/test/accounts_client/test_accounts_client_unittest.cc index f96fea2..c9dfdb5 100644 --- a/sync/test/accounts_client/test_accounts_client_unittest.cc +++ b/sync/test/accounts_client/test_accounts_client_unittest.cc @@ -62,10 +62,10 @@ TEST(TestAccountsClientTest, ClaimAccountSuccess) { NoNetworkTestAccountsClient client(kServer, kAccountSpace, usernames); base::DictionaryValue success_dict; - success_dict.Set("username", new StringValue(kUsername)); - success_dict.Set("account_space", new StringValue(kAccountSpace)); - success_dict.Set("session_id", new StringValue(kSessionId)); - success_dict.Set("expiration_time", new StringValue(kExpirationTime)); + success_dict.Set("username", new base::StringValue(kUsername)); + success_dict.Set("account_space", new base::StringValue(kAccountSpace)); + success_dict.Set("session_id", new base::StringValue(kSessionId)); + success_dict.Set("expiration_time", new base::StringValue(kExpirationTime)); string success_response; base::JSONWriter::Write(&success_dict, &success_response); diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index e505104..c0a1ef1 100644 --- a/sync/tools/sync_client.cc +++ b/sync/tools/sync_client.cc @@ -117,7 +117,7 @@ class NullEncryptor : public Encryptor { } }; -std::string ValueToString(const Value& value) { +std::string ValueToString(const base::Value& value) { std::string str; base::JSONWriter::Write(&value, &str); return str; diff --git a/ui/web_dialogs/web_dialog_ui.cc b/ui/web_dialogs/web_dialog_ui.cc index 6c978c2..c0ffb02 100644 --- a/ui/web_dialogs/web_dialog_ui.cc +++ b/ui/web_dialogs/web_dialog_ui.cc @@ -102,7 +102,7 @@ void WebDialogUI::RenderViewCreated(RenderViewHost* render_view_host) { delegate->OnDialogShown(web_ui(), render_view_host); } -void WebDialogUI::OnDialogClosed(const ListValue* args) { +void WebDialogUI::OnDialogClosed(const base::ListValue* args) { WebDialogDelegate* delegate = GetDelegate(web_ui()->GetWebContents()); if (delegate) { std::string json_retval; |