Save the oauth client id used in App Notification setup

chrome/browser/extensions/extension_sync_data.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/extensions/extension_sync_data.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/sync/protocol/app_specifics.pb.h"
 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
 
 ExtensionSyncData::ExtensionSyncData()
     : uninstalled_(false),
       enabled_(false),
       incognito_enabled_(false),
       type_(Extension::SYNC_TYPE_NONE),
-      notifications_initial_setup_done_(false),
       notifications_disabled_(false) {
 }
 
 ExtensionSyncData::ExtensionSyncData(const SyncData& sync_data)
     : uninstalled_(false),
       enabled_(false),
       incognito_enabled_(false),
       type_(Extension::SYNC_TYPE_NONE),
-      notifications_initial_setup_done_(false),
       notifications_disabled_(false) {
   PopulateFromSyncData(sync_data);
 }
 
 ExtensionSyncData::ExtensionSyncData(const SyncChange& sync_change)
     : uninstalled_(sync_change.change_type() == SyncChange::ACTION_DELETE) {
   PopulateFromSyncData(sync_change.sync_data());
 }
 
 ExtensionSyncData::ExtensionSyncData(const Extension& extension,
                                      bool enabled,
                                      bool incognito_enabled,
-                                     bool notifications_initial_setup_done,
+                                     const std::string& notifications_client_id,
                                      bool notifications_disabled)
   : id_(extension.id()),
     uninstalled_(false),
     enabled_(enabled),
     incognito_enabled_(incognito_enabled),
     type_(extension.GetSyncType()),
     version_(*extension.version()),
     update_url_(extension.update_url()),
     name_(extension.name()),
-    notifications_initial_setup_done_(notifications_initial_setup_done),
+    notifications_client_id_(notifications_client_id),
     notifications_disabled_(notifications_disabled) {
 }
 
 ExtensionSyncData::~ExtensionSyncData() {}
 
 void ExtensionSyncData::PopulateAppSpecifics(
     sync_pb::AppSpecifics* specifics) const {
   DCHECK(specifics);
   sync_pb::AppNotificationSettings* notif_settings =
       specifics->mutable_notification_settings();
-  notif_settings->set_initial_setup_done(notifications_initial_setup_done_);
+  if (!notifications_client_id_.empty())
+    notif_settings->set_oauth_client_id(notifications_client_id_);
   notif_settings->set_disabled(notifications_disabled_);
   PopulateSyncSpecifics(specifics->mutable_extension());
 }
 
 void ExtensionSyncData::PopulateSyncSpecifics(
     sync_pb::ExtensionSpecifics* specifics) const {
   DCHECK(Extension::IdIsValid(id_));
   specifics->set_id(id_);
   specifics->set_update_url(update_url_.spec());
   specifics->set_version(version_.GetString());
@@ skipping 52 matching lines @@
   const sync_pb::EntitySpecifics& entity_specifics = sync_data.GetSpecifics();
   sync_pb::ExtensionSpecifics extension_expecifics;
   if (entity_specifics.HasExtension(sync_pb::extension)) {
     extension_expecifics = entity_specifics.GetExtension(sync_pb::extension);
     type_ = Extension::SYNC_TYPE_EXTENSION;
   } else if (entity_specifics.HasExtension(sync_pb::app)) {
     sync_pb::AppSpecifics app_specifics = entity_specifics.GetExtension(
         sync_pb::app);
     extension_expecifics = app_specifics.extension();
     type_ = Extension::SYNC_TYPE_APP;
-    notifications_initial_setup_done_ =
-        app_specifics.has_notification_settings() &&
-        app_specifics.notification_settings().has_initial_setup_done() &&
-        app_specifics.notification_settings().initial_setup_done();
+    if (app_specifics.has_notification_settings() &&
+        app_specifics.notification_settings().has_oauth_client_id()) {
+      notifications_client_id_ =
+          app_specifics.notification_settings().oauth_client_id();
+    }
+
     notifications_disabled_ =
         app_specifics.has_notification_settings() &&
         app_specifics.notification_settings().has_disabled() &&
         app_specifics.notification_settings().disabled();
   } else {
     LOG(FATAL) << "Attempt to sync bad EntitySpecifics.";
   }
   PopulateFromExtensionSpecifics(extension_expecifics);
 }
-