Index: sync/internal_api/js_sync_manager_observer_unittest.cc |
diff --git a/sync/internal_api/js_sync_manager_observer_unittest.cc b/sync/internal_api/js_sync_manager_observer_unittest.cc |
index 40c71be3dccaf8f3ace23a0f84d7eecd3b0d4db7..56580f4f5a9261ece2fc00248c4c7e9ad41e9881 100644 |
--- a/sync/internal_api/js_sync_manager_observer_unittest.cc |
+++ b/sync/internal_api/js_sync_manager_observer_unittest.cc |
@@ -56,7 +56,7 @@ TEST_F(JsSyncManagerObserverTest, NoArgNotifiations) { |
} |
TEST_F(JsSyncManagerObserverTest, OnInitializationComplete) { |
- DictionaryValue expected_details; |
+ base::DictionaryValue expected_details; |
syncer::ModelTypeSet restored_types; |
restored_types.Put(BOOKMARKS); |
restored_types.Put(NIGORI); |
@@ -88,7 +88,7 @@ TEST_F(JsSyncManagerObserverTest, OnSyncCycleCompleted) { |
base::Time::Now(), |
std::vector<int>(MODEL_TYPE_COUNT, 0), |
std::vector<int>(MODEL_TYPE_COUNT, 0)); |
- DictionaryValue expected_details; |
+ base::DictionaryValue expected_details; |
expected_details.Set("snapshot", snapshot.ToValue()); |
EXPECT_CALL(mock_js_event_handler_, |
@@ -103,7 +103,7 @@ TEST_F(JsSyncManagerObserverTest, OnActionableError) { |
SyncProtocolError sync_error; |
sync_error.action = CLEAR_USER_DATA_AND_RESYNC; |
sync_error.error_type = TRANSIENT_ERROR; |
- DictionaryValue expected_details; |
+ base::DictionaryValue expected_details; |
expected_details.Set("syncError", sync_error.ToValue()); |
EXPECT_CALL(mock_js_event_handler_, |
@@ -117,7 +117,7 @@ TEST_F(JsSyncManagerObserverTest, OnActionableError) { |
TEST_F(JsSyncManagerObserverTest, OnConnectionStatusChange) { |
const ConnectionStatus kStatus = CONNECTION_AUTH_ERROR; |
- DictionaryValue expected_details; |
+ base::DictionaryValue expected_details; |
expected_details.SetString("status", |
ConnectionStatusToString(kStatus)); |
@@ -130,9 +130,9 @@ TEST_F(JsSyncManagerObserverTest, OnConnectionStatusChange) { |
} |
TEST_F(JsSyncManagerObserverTest, SensitiveNotifiations) { |
- DictionaryValue redacted_token_details; |
+ base::DictionaryValue redacted_token_details; |
redacted_token_details.SetString("token", "<redacted>"); |
- DictionaryValue redacted_bootstrap_token_details; |
+ base::DictionaryValue redacted_bootstrap_token_details; |
redacted_bootstrap_token_details.SetString("bootstrapToken", "<redacted>"); |
EXPECT_CALL(mock_js_event_handler_, |