Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(469)

Side by Side Diff: chrome/browser/prefs/prefs_syncable_service_unittest.cc

Issue 507913002: Finish converting chrome_strings target to use qualified paths. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/json/json_reader.h" 5 #include "base/json/json_reader.h"
6 #include "base/json/json_string_value_serializer.h" 6 #include "base/json/json_string_value_serializer.h"
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/prefs/scoped_user_pref_update.h" 9 #include "base/prefs/scoped_user_pref_update.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/prefs/pref_model_associator.h" 11 #include "chrome/browser/prefs/pref_model_associator.h"
12 #include "chrome/browser/prefs/pref_service_syncable.h" 12 #include "chrome/browser/prefs/pref_service_syncable.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "chrome/grit/locale_settings.h"
14 #include "chrome/test/base/testing_pref_service_syncable.h" 15 #include "chrome/test/base/testing_pref_service_syncable.h"
15 #include "components/pref_registry/pref_registry_syncable.h" 16 #include "components/pref_registry/pref_registry_syncable.h"
16 #include "grit/locale_settings.h"
17 #include "sync/api/attachments/attachment_id.h" 17 #include "sync/api/attachments/attachment_id.h"
18 #include "sync/api/sync_change.h" 18 #include "sync/api/sync_change.h"
19 #include "sync/api/sync_data.h" 19 #include "sync/api/sync_data.h"
20 #include "sync/api/sync_error_factory_mock.h" 20 #include "sync/api/sync_error_factory_mock.h"
21 #include "sync/api/syncable_service.h" 21 #include "sync/api/syncable_service.h"
22 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h" 22 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"
23 #include "sync/protocol/preference_specifics.pb.h" 23 #include "sync/protocol/preference_specifics.pb.h"
24 #include "sync/protocol/sync.pb.h" 24 #include "sync/protocol/sync.pb.h"
25 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
26 26
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 715
716 InitWithNoSyncData(); 716 InitWithNoSyncData();
717 717
718 scoped_ptr<base::Value> null_value(base::Value::CreateNullValue()); 718 scoped_ptr<base::Value> null_value(base::Value::CreateNullValue());
719 syncer::SyncChangeList list; 719 syncer::SyncChangeList list;
720 list.push_back(MakeRemoteChange( 720 list.push_back(MakeRemoteChange(
721 1, prefs::kHomePage, *null_value, SyncChange::ACTION_DELETE)); 721 1, prefs::kHomePage, *null_value, SyncChange::ACTION_DELETE));
722 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list); 722 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
723 EXPECT_TRUE(pref->IsDefaultValue()); 723 EXPECT_TRUE(pref->IsDefaultValue());
724 } 724 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugin_infobar_delegates.cc ('k') | chrome/browser/safe_browsing/safe_browsing_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698