sync: take two for: "Added classes to enable session sync...

chrome/browser/sync/syncable/model_type.cc

 // Copyright (c) 2010 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/sync/syncable/model_type.h"
 
 #include "chrome/browser/sync/engine/syncproto.h"
 #include "chrome/browser/sync/protocol/app_specifics.pb.h"
 #include "chrome/browser/sync/protocol/autofill_specifics.pb.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/protocol/extension_specifics.pb.h"
 #include "chrome/browser/sync/protocol/nigori_specifics.pb.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"
+#include "chrome/browser/sync/protocol/session_specifics.pb.h"
 #include "chrome/browser/sync/protocol/sync.pb.h"
 #include "chrome/browser/sync/protocol/theme_specifics.pb.h"
 #include "chrome/browser/sync/protocol/typed_url_specifics.pb.h"
 
 namespace syncable {
 
 void AddDefaultExtensionValue(syncable::ModelType datatype,
                               sync_pb::EntitySpecifics* specifics) {
   switch (datatype) {
     case BOOKMARKS:
@@ skipping 13 matching lines @@
       break;
     case TYPED_URLS:
       specifics->MutableExtension(sync_pb::typed_url);
       break;
     case EXTENSIONS:
       specifics->MutableExtension(sync_pb::extension);
       break;
     case NIGORI:
       specifics->MutableExtension(sync_pb::nigori);
       break;
+    case SESSIONS:
+      specifics->MutableExtension(sync_pb::session);
+      break;
     case APPS:
       specifics->MutableExtension(sync_pb::app);
       break;
     default:
       NOTREACHED() << "No known extension for model type.";
   }
 }
 
 // Note: keep this consistent with GetModelType in syncable.cc!
 ModelType GetModelType(const sync_pb::SyncEntity& sync_pb_entity) {
@@ skipping 47 matching lines @@
 
   if (specifics.HasExtension(sync_pb::extension))
     return EXTENSIONS;
 
   if (specifics.HasExtension(sync_pb::nigori))
     return NIGORI;
 
   if (specifics.HasExtension(sync_pb::app))
     return APPS;
 
+  if (specifics.HasExtension(sync_pb::session))
+    return SESSIONS;
+
   return UNSPECIFIED;
 }
 
 std::string ModelTypeToString(ModelType model_type) {
   switch (model_type) {
     case BOOKMARKS:
       return "Bookmarks";
     case PREFERENCES:
       return "Preferences";
     case PASSWORDS:
       return "Passwords";
     case AUTOFILL:
       return "Autofill";
     case THEMES:
       return "Themes";
     case TYPED_URLS:
       return "Typed URLs";
     case EXTENSIONS:
       return "Extensions";
     case NIGORI:
       return "Encryption keys";
+    case SESSIONS:
+      return "Sessions";
     case APPS:
       return "Apps";
     default:
       NOTREACHED() << "No known extension for model type.";
       return "INVALID";
   }
 }
 
 // TODO(akalin): Figure out a better way to do these mappings.
 
 namespace {
 const char kBookmarkNotificationType[] = "BOOKMARK";
 const char kPreferenceNotificationType[] = "PREFERENCE";
 const char kPasswordNotificationType[] = "PASSWORD";
 const char kAutofillNotificationType[] = "AUTOFILL";
 const char kThemeNotificationType[] = "THEME";
 const char kTypedUrlNotificationType[] = "TYPED_URL";
 const char kExtensionNotificationType[] = "EXTENSION";
 const char kNigoriNotificationType[] = "NIGORI";
 const char kAppNotificationType[] = "APP";
+const char kSessionNotificationType[] = "SESSION";
 // TODO(akalin): This is a hack to make new sync data types work with
 // server-issued notifications.  Remove this when it's not needed
 // anymore.
 const char kUnknownNotificationType[] = "UNKNOWN";
 }  // namespace
 
 bool RealModelTypeToNotificationType(ModelType model_type,
                                      std::string* notification_type) {
   switch (model_type) {
     case BOOKMARKS:
@@ skipping 16 matching lines @@
       return true;
     case EXTENSIONS:
       *notification_type = kExtensionNotificationType;
       return true;
     case NIGORI:
       *notification_type = kNigoriNotificationType;
       return true;
     case APPS:
       *notification_type = kAppNotificationType;
       return true;
+    case SESSIONS:
+      *notification_type = kSessionNotificationType;
+      return true;
     // TODO(akalin): This is a hack to make new sync data types work with
     // server-issued notifications.  Remove this when it's not needed
     // anymore.
     case UNSPECIFIED:
       *notification_type = kUnknownNotificationType;
       return true;
     default:
       break;
   }
   notification_type->clear();
@@ skipping 22 matching lines @@
     return true;
   } else if (notification_type == kExtensionNotificationType) {
     *model_type = EXTENSIONS;
     return true;
   } else if (notification_type == kNigoriNotificationType) {
     *model_type = NIGORI;
     return true;
   } else if (notification_type == kAppNotificationType) {
     *model_type = APPS;
     return true;
-  } else if (notification_type == kUnknownNotificationType) {
+  } else if (notification_type == kSessionNotificationType) {
+    *model_type = SESSIONS;
+    return true;
+  }
+  else if (notification_type == kUnknownNotificationType) {
     // TODO(akalin): This is a hack to make new sync data types work with
     // server-issued notifications.  Remove this when it's not needed
     // anymore.
     *model_type = UNSPECIFIED;
     return true;
   }
   *model_type = UNSPECIFIED;
   return false;
 }
 
 }  // namespace syncable