Revert 49967 - Client side changes to set and get nigori specifics....

chrome/browser/sync/engine/syncapi.h

 // Copyright (c) 2009 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.
 
 // This file defines the "sync API", an interface to the syncer
 // backend that exposes (1) the core functionality of maintaining a consistent
 // local snapshot of a hierarchical object set; (2) a means to transactionally
 // access and modify those objects; (3) a means to control client/server
 // synchronization tasks, namely: pushing local object modifications to a
 // server, pulling nonlocal object modifications from a server to this client,
@@ skipping 62 matching lines @@
 class ReadTransaction;
 class ScopedDirLookup;
 class WriteTransaction;
 }
 
 namespace sync_pb {
 class AutofillSpecifics;
 class BookmarkSpecifics;
 class EntitySpecifics;
 class ExtensionSpecifics;
-class NigoriSpecifics;
 class PasswordSpecifics;
 class PreferenceSpecifics;
 class PasswordSpecifics;
 class PasswordSpecificsData;
 class ThemeSpecifics;
 class TypedUrlSpecifics;
 }
 
 namespace sync_api {
 
@@ skipping 80 matching lines @@
   // Favicons are expected to be PNG images, and though no verification is
   // done on the syncapi client of this, the server may reject favicon updates
   // that are invalid for whatever reason.
   // TODO(ncarter): Remove this datatype-specific accessor.
   void GetFaviconBytes(std::vector<unsigned char>* output) const;
 
   // Getter specific to the AUTOFILL datatype.  Returns protobuf
   // data.  Can only be called if GetModelType() == AUTOFILL.
   const sync_pb::AutofillSpecifics& GetAutofillSpecifics() const;
 
-  // Getter specific to the NIGORI datatype.  Returns protobuf
-  // data.  Can only be called if GetModelType() == NIGORI.
-  const sync_pb::NigoriSpecifics& GetNigoriSpecifics() const;
-
   // Getter specific to the PASSWORD datatype.  Returns protobuf
   // data.  Can only be called if GetModelType() == PASSWORD.
   bool GetPasswordSpecifics(sync_pb::PasswordSpecificsData*) const;
 
   // Getter specific to the PREFERENCE datatype.  Returns protobuf
   // data.  Can only be called if GetModelType() == PREFERENCE.
   const sync_pb::PreferenceSpecifics& GetPreferenceSpecifics() const;
 
   // Getter specific to the THEME datatype.  Returns protobuf
   // data.  Can only be called if GetModelType() == THEME.
@@ skipping 103 matching lines @@
   // Legacy, bookmark-specific setters that wrap SetBookmarkSpecifics() above.
   // Should only be called if GetModelType() == BOOKMARK.
   // TODO(ncarter): Remove these two datatype-specific accessors.
   void SetURL(const GURL& url);
   void SetFaviconBytes(const std::vector<unsigned char>& bytes);
 
   // Set the autofill specifics (name and value).
   // Should only be called if GetModelType() == AUTOFILL.
   void SetAutofillSpecifics(const sync_pb::AutofillSpecifics& specifics);
 
-  // Set the nigori specifics.
-  // Should only be called if GetModelType() == NIGORI.
-  void SetNigoriSpecifics(const sync_pb::NigoriSpecifics& specifics);
-
   // Set the password specifics.
   // Should only be called if GetModelType() == PASSWORD.
   void SetPasswordSpecifics(const sync_pb::PasswordSpecificsData& specifics);
 
   // Set the preference specifics (name and value).
   // Should only be called if GetModelType() == PREFERENCE.
   void SetPreferenceSpecifics(const sync_pb::PreferenceSpecifics& specifics);
 
   // Set the theme specifics (name and value).
   // Should only be called if GetModelType() == THEME.
@@ skipping 23 matching lines @@
 
   // Private helpers to set type-specific protobuf data.  These don't
   // do any checking on the previous modeltype, so they can be used
   // for internal initialization (you can use them to set the modeltype).
   // Additionally, they will mark for syncing if the underlying value
   // changes.
   void PutAutofillSpecificsAndMarkForSyncing(
       const sync_pb::AutofillSpecifics& new_value);
   void PutBookmarkSpecificsAndMarkForSyncing(
       const sync_pb::BookmarkSpecifics& new_value);
-  void PutNigoriSpecificsAndMarkForSyncing(
-      const sync_pb::NigoriSpecifics& new_value);
   void PutPasswordSpecificsAndMarkForSyncing(
       const sync_pb::PasswordSpecifics& new_value);
   void PutPreferenceSpecificsAndMarkForSyncing(
       const sync_pb::PreferenceSpecifics& new_value);
   void PutThemeSpecificsAndMarkForSyncing(
       const sync_pb::ThemeSpecifics& new_value);
   void PutTypedUrlSpecificsAndMarkForSyncing(
       const sync_pb::TypedUrlSpecifics& new_value);
   void PutExtensionSpecificsAndMarkForSyncing(
       const sync_pb::ExtensionSpecifics& new_value);
@@ skipping 506 matching lines @@
   // This allows actual HttpPostProvider subclass implementations to be
   // reference counted, which is useful if a particular implementation uses
   // multiple threads to serve network requests.
   virtual void Destroy(HttpPostProviderInterface* http) = 0;
   virtual ~HttpPostProviderFactory() { }
 };
 
 }  // namespace sync_api
 
 #endif  // CHROME_BROWSER_SYNC_ENGINE_SYNCAPI_H_