Reland: Client side changes to set and get nigori specifics with passing

chrome/browser/sync/syncable/model_type.cc

Index: chrome/browser/sync/syncable/model_type.cc
diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc
index 8aefe404efc29c258861eb6ac7b604b579d37b8c..ea89bb129d5756d53319e00a945745926e1c0fad 100644
--- a/chrome/browser/sync/syncable/model_type.cc
+++ b/chrome/browser/sync/syncable/model_type.cc
@@ -8,6 +8,7 @@
 #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/sync.pb.h"
@@ -40,6 +41,9 @@ void AddDefaultExtensionValue(syncable::ModelType datatype,
     case EXTENSIONS:
       specifics->MutableExtension(sync_pb::extension);
       break;
+    case NIGORI:
+      specifics->MutableExtension(sync_pb::nigori);
+      break;
     default:
       NOTREACHED() << "No known extension for model type.";
   }
@@ -98,6 +102,9 @@ ModelType GetModelTypeFromSpecifics(const sync_pb::EntitySpecifics& specifics) {
   if (specifics.HasExtension(sync_pb::extension))
     return EXTENSIONS;
 
+  if (specifics.HasExtension(sync_pb::nigori))
+    return NIGORI;
+
   return UNSPECIFIED;
 }