Completely rewrite the PpdProvider/PpdCache to use the SCS backend. Along the way, clean it up a l…

components/sync/protocol/proto_visitors.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_SYNC_PROTOCOL_PROTO_VISITORS_H_
 #define COMPONENTS_SYNC_PROTOCOL_PROTO_VISITORS_H_
 
 #include "components/sync/protocol/app_list_specifics.pb.h"
 #include "components/sync/protocol/app_notification_specifics.pb.h"
 #include "components/sync/protocol/app_setting_specifics.pb.h"
@@ skipping 187 matching lines @@
 
 VISIT_PROTO_FIELDS(const sync_pb::ArcPackageSpecifics& proto) {
   VISIT(package_name);
   VISIT(package_version);
   VISIT(last_backup_android_id);
   VISIT(last_backup_time);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::PrinterPPDReference& proto) {
   VISIT(user_supplied_ppd_url);
-  VISIT(effective_manufacturer);
-  VISIT(effective_model);
+  VISIT(effective_make_and_model);
 }
 
 VISIT_PROTO_FIELDS(const sync_pb::ReadingListSpecifics& proto) {
   VISIT(entry_id);
   VISIT(title);
   VISIT(url);
   VISIT(creation_time_us);
   VISIT(update_time_us);
   VISIT_ENUM(status);
 }
@@ skipping 665 matching lines @@
 
 }  // namespace syncer
 
 #undef VISIT_
 #undef VISIT_BYTES
 #undef VISIT_ENUM
 #undef VISIT
 #undef VISIT_REP
 
 #endif  // COMPONENTS_SYNC_PROTOCOL_PROTO_VISITORS_H_