Revert 56423 - Added classes to enable session sync functionality....

chrome/browser/sync/syncable/model_type.cc

Index: chrome/browser/sync/syncable/model_type.cc
===================================================================
--- chrome/browser/sync/syncable/model_type.cc	(revision 56425)
+++ chrome/browser/sync/syncable/model_type.cc	(working copy)
@@ -12,7 +12,6 @@
 #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"
@@ -46,9 +45,6 @@
     case NIGORI:
       specifics->MutableExtension(sync_pb::nigori);
       break;
-    case SESSIONS:
-      specifics->MutableExtension(sync_pb::session);
-      break;
     case APPS:
       specifics->MutableExtension(sync_pb::app);
       break;
@@ -116,9 +112,6 @@
   if (specifics.HasExtension(sync_pb::app))
     return APPS;
 
-  if (specifics.HasExtension(sync_pb::session))
-    return SESSIONS;
-
   return UNSPECIFIED;
 }
 
@@ -140,8 +133,6 @@
       return "Extensions";
     case NIGORI:
       return "Encryption keys";
-    case SESSIONS:
-      return "Sessions";
     case APPS:
       return "Apps";
     default:
@@ -162,7 +153,6 @@
 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.
@@ -199,9 +189,6 @@
     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.
@@ -244,11 +231,7 @@
   } else if (notification_type == kAppNotificationType) {
     *model_type = APPS;
     return true;
-  } else if (notification_type == kSessionNotificationType) {
-    *model_type = SESSIONS;
-    return true;
-  }
-  else if (notification_type == kUnknownNotificationType) {
+  } 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.