Revert special handling of Android credentials in Chrome Sync.

It was introduced in r488421 to handle the credentials without trailing '/' in signon_realm and origin.
Now however, the signon_realm is created correctly by GmsCore. The origin has no '/'. As a result
- r488421 is useless with a lot of complexity.
- r488421 is harmful because it prevent the credential from being deleted via passwords.google.com. See b/69245513

R=battre@chromium.org

Bug: 739101,801918
Change-Id: I20e64481b8dd972e3b43f18a00b0b3078f58c4fe
Reviewed-on: https://chromium-review.googlesource.com/897610Reviewed-by: Dominic Battré <battre@chromium.org>
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534073}

components/password_manager/core/browser/password_syncable_service.h

@@ -11,7 +11,6 @@
 
 #include "base/macros.h"
 #include "base/sequence_checker.h"
-#include "base/time/clock.h"
 #include "components/password_manager/core/browser/password_store_change.h"
 #include "components/sync/model/sync_change.h"
 #include "components/sync/model/sync_data.h"
@@ -61,12 +60,6 @@ class PasswordSyncableService : public syncer::SyncableService {
   void InjectStartSyncFlare(
       const syncer::SyncableService::StartSyncFlare& flare);
 
-#if defined(UNIT_TEST)
-  void set_clock(std::unique_ptr<base::Clock> clock) {
-    clock_ = std::move(clock);
-  }
-#endif
-
  private:
   // Map from password sync tag to password form.
   typedef std::map<std::string, autofill::PasswordForm*> PasswordEntryMap;
@@ -87,23 +80,14 @@ class PasswordSyncableService : public syncer::SyncableService {
   // Uses the |PasswordStore| APIs to change entries.
   void WriteToPasswordStore(const SyncEntries& entries);
 
-  // Goes through |sync_data| and for each entry merges the data with
-  // |unmatched_data_from_password_db|. The result of merge is recorded in
-  // |sync_entries| or |updated_db_entries|. Successfully merged elements are
-  // removed from |unmatched_data_from_password_db|.
-  void MergeSyncDataWithLocalData(
-      const syncer::SyncDataList& sync_data,
-      PasswordEntryMap* unmatched_data_from_password_db,
-      SyncEntries* sync_entries,
-      syncer::SyncChangeList* updated_db_entries);
-
   // Examines |data|, an entry in sync db, and updates |sync_entries| or
   // |updated_db_entries| accordingly. An element is removed from
   // |unmatched_data_from_password_db| if its tag is identical to |data|'s.
-  void CreateOrUpdateEntry(const sync_pb::PasswordSpecificsData& data,
-                           PasswordEntryMap* unmatched_data_from_password_db,
-                           SyncEntries* sync_entries,
-                           syncer::SyncChangeList* updated_db_entries);
+  static void CreateOrUpdateEntry(
+      const syncer::SyncData& data,
+      PasswordEntryMap* unmatched_data_from_password_db,
+      SyncEntries* sync_entries,
+      syncer::SyncChangeList* updated_db_entries);
 
   // Calls |operation| for each element in |entries| and appends the changes to
   // |all_changes|.
@@ -125,9 +109,6 @@ class PasswordSyncableService : public syncer::SyncableService {
   // A signal activated by this class to start sync as soon as possible.
   syncer::SyncableService::StartSyncFlare flare_;
 
-  // Clock for date_synced updates.
-  std::unique_ptr<base::Clock> clock_;
-
   // True if processing sync changes is in progress.
   bool is_processing_sync_changes_;