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

Side by Side Diff: components/sync/api/fake_model_type_service.h

Issue 2389063002: [Sync] Fixing easy lint violations. (Closed)
Patch Set: Updated 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
« no previous file with comments | « components/sync/api/entity_data.cc ('k') | components/sync/api/fake_model_type_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_SERVICE_H_ 5 #ifndef COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_SERVICE_H_
6 #define COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_SERVICE_H_ 6 #define COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_SERVICE_H_
7 7
8 #include <map>
8 #include <memory> 9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "components/sync/api/entity_data.h" 12 #include "components/sync/api/entity_data.h"
12 #include "components/sync/api/metadata_batch.h" 13 #include "components/sync/api/metadata_batch.h"
13 #include "components/sync/api/model_type_service.h" 14 #include "components/sync/api/model_type_service.h"
14 #include "components/sync/core/non_blocking_sync_common.h" 15 #include "components/sync/core/non_blocking_sync_common.h"
15 #include "components/sync/protocol/data_type_state.pb.h" 16 #include "components/sync/protocol/data_type_state.pb.h"
16 #include "components/sync/protocol/entity_metadata.pb.h" 17 #include "components/sync/protocol/entity_metadata.pb.h"
17 18
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // The conflict resolution to use for calls to ResolveConflict. 140 // The conflict resolution to use for calls to ResolveConflict.
140 std::unique_ptr<ConflictResolution> conflict_resolution_; 141 std::unique_ptr<ConflictResolution> conflict_resolution_;
141 142
142 // The error to produce on the next service call. 143 // The error to produce on the next service call.
143 SyncError service_error_; 144 SyncError service_error_;
144 }; 145 };
145 146
146 } // namespace syncer 147 } // namespace syncer
147 148
148 #endif // COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_SERVICE_H_ 149 #endif // COMPONENTS_SYNC_API_FAKE_MODEL_TYPE_SERVICE_H_
OLDNEW
« no previous file with comments | « components/sync/api/entity_data.cc ('k') | components/sync/api/fake_model_type_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698