[Sync] Rework Invalidator-related unit tests

chrome/browser/sync/test/integration/sync_test.cc

 // Copyright (c) 2012 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/test/integration/sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 633 matching lines @@
 }
 
 void SyncTest::EnableNotifications() {
   EnableNotificationsImpl();
   notifications_enabled_ = true;
 }
 
 void SyncTest::TriggerNotification(syncer::ModelTypeSet changed_types) {
   ASSERT_TRUE(ServerSupportsNotificationControl());
   const std::string& data =
-      syncer::P2PNotificationData("from_server",
-                                         syncer::NOTIFY_ALL,
-                                         changed_types).ToString();
+      syncer::P2PNotificationData(
+          "from_server",
+          syncer::NOTIFY_ALL,
+          syncer::ObjectIdSetToStateMap(
+              syncer::ModelTypeSetToObjectIdSet(changed_types), ""),
+          syncer::REMOTE_NOTIFICATION).ToString();
   const std::string& path =
       std::string("chromiumsync/sendnotification?channel=") +
       syncer::kSyncP2PNotificationChannel + "&data=" + data;
   ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path));
   ASSERT_EQ("Notification sent",
             UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()));
 }
 
 bool SyncTest::ServerSupportsErrorTriggering() const {
   EXPECT_NE(SERVER_TYPE_UNDECIDED, server_type_);
@@ skipping 128 matching lines @@
 
 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter,
                               const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SetProxyConfigCallback, &done,
                  make_scoped_refptr(context_getter), proxy_config));
   done.Wait();
 }