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

Side by Side Diff: components/sync/device_info/device_info_service_unittest.cc

Issue 2388973002: [Sync] Removing duplicate includes, part 2. (Closed)
Patch Set: Update for Max's comments. Created 4 years, 2 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "components/sync/device_info/device_info_service.h" 5 #include "components/sync/device_info/device_info_service.h"
6 6
7 #include <map>
8 #include <memory>
9 #include <set> 7 #include <set>
10 #include <string>
11 #include <utility> 8 #include <utility>
12 9
13 #include "base/bind.h" 10 #include "base/bind.h"
14 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
15 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
16 #include "base/run_loop.h" 13 #include "base/run_loop.h"
17 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
18 #include "components/sync/api/data_batch.h" 15 #include "components/sync/api/data_batch.h"
19 #include "components/sync/api/data_type_error_handler_mock.h" 16 #include "components/sync/api/data_type_error_handler_mock.h"
20 #include "components/sync/api/entity_data.h" 17 #include "components/sync/api/entity_data.h"
21 #include "components/sync/api/fake_model_type_change_processor.h" 18 #include "components/sync/api/fake_model_type_change_processor.h"
22 #include "components/sync/api/metadata_batch.h" 19 #include "components/sync/api/metadata_batch.h"
23 #include "components/sync/api/model_type_store.h"
24 #include "components/sync/base/time.h" 20 #include "components/sync/base/time.h"
25 #include "components/sync/core/test/model_type_store_test_util.h" 21 #include "components/sync/core/test/model_type_store_test_util.h"
26 #include "components/sync/device_info/local_device_info_provider_mock.h" 22 #include "components/sync/device_info/local_device_info_provider_mock.h"
27 #include "components/sync/protocol/data_type_state.pb.h" 23 #include "components/sync/protocol/data_type_state.pb.h"
28 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
29 25
30 namespace syncer { 26 namespace syncer {
31 27
32 using base::Time; 28 using base::Time;
33 using base::TimeDelta; 29 using base::TimeDelta;
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 specifics.set_cache_guid("non-local"); 747 specifics.set_cache_guid("non-local");
752 PushBackEntityChangeAdd(specifics, &change_list); 748 PushBackEntityChangeAdd(specifics, &change_list);
753 service()->ApplySyncChanges(service()->CreateMetadataChangeList(), 749 service()->ApplySyncChanges(service()->CreateMetadataChangeList(),
754 change_list); 750 change_list);
755 EXPECT_EQ(1, service()->CountActiveDevices()); 751 EXPECT_EQ(1, service()->CountActiveDevices());
756 } 752 }
757 753
758 } // namespace 754 } // namespace
759 755
760 } // namespace syncer 756 } // namespace syncer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698