sync: Add helper class for P2P invalidations

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

 // Copyright 2013 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/profile_sync_service_harness.h"
 
 #include <cstddef>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ skipping 13 matching lines @@
 #include "base/timer/timer.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/p2p_invalidation_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_base.h"
 #include "chrome/browser/sync/about_sync_util.h"
 #include "chrome/browser/sync/backend_migrator.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
+#include "chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h"
 #include "chrome/browser/sync/test/integration/status_change_checker.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/sync_driver/data_type_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/internal_api/public/base/progress_marker_map.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 #include "sync/internal_api/public/util/sync_string_conversions.h"
 
@@ skipping 154 matching lines @@
     syncer::ModelTypeSet synced_datatypes) {
   // Initialize the sync client's profile sync service object.
   if (service() == NULL) {
     LOG(ERROR) << "SetupSync(): service() is null.";
     return false;
   }
 
   // Subscribe sync client to notifications from the profile sync service.
   if (!service()->HasObserver(this))
     service()->AddObserver(this);
+  // Start listening for and emitting notifications of commits.
+  p2p_invalidation_forwarder_.reset(
+      new P2PInvalidationForwarder(service(), p2p_invalidation_service_));

[haitaol1, 2014/02/19 21:15:21]

You don't need p2p_invalidation_service_ if creating p2p_invalidation_forwarder_
in constructor.

[rlarocque, 2014/02/19 22:21:14]

Good point.  I hadn't thought of that.

Fixed.

 
   // Tell the sync service that setup is in progress so we don't start syncing
   // until we've finished configuration.
   service()->SetSetupInProgress(true);
 
   // Authenticate sync client using GAIA credentials.
   service()->signin()->SetAuthenticatedUsername(username_);
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
                                   username_);
   GoogleServiceSigninSuccessDetails details(username_, password_);
@@ skipping 86 matching lines @@
 void ProfileSyncServiceHarness::OnStateChanged() {
   if (!status_change_checker_)
     return;
 
   DVLOG(1) << GetClientInfoString(status_change_checker_->source());
   if (status_change_checker_->IsExitConditionSatisfied())
     QuitMessageLoop();
 }
 
 void ProfileSyncServiceHarness::OnSyncCycleCompleted() {
   // Integration tests still use p2p notifications.

[haitaol1, 2014/02/19 21:15:21]

obsolete comment?

[rlarocque, 2014/02/19 22:21:14]

Correct.  Removed.

-  const SyncSessionSnapshot& snap = GetLastSessionSnapshot();
-  bool is_notifiable_commit =
-      (snap.model_neutral_state().num_successful_commits > 0);
-  if (is_notifiable_commit && p2p_invalidation_service_) {
-    syncer::ModelTypeSet model_types =
-        snap.model_neutral_state().commit_request_types;
-    syncer::ObjectIdSet ids = ModelTypeSetToObjectIdSet(model_types);
-    p2p_invalidation_service_->SendInvalidation(ids);
-  }
   OnStateChanged();
 }
 
 bool ProfileSyncServiceHarness::AwaitPassphraseRequired() {
   DVLOG(1) << GetClientInfoString("AwaitPassphraseRequired");
   CallbackStatusChecker passphrase_required_checker(
       base::Bind(&::IsPassphraseRequired, base::Unretained(this)),
       "IsPassphraseRequired");
   return AwaitStatusChange(&passphrase_required_checker,
                            "AwaitPassphraseRequired");
@@ skipping 464 matching lines @@
 
 std::string ProfileSyncServiceHarness::GetServiceStatus() {
   scoped_ptr<base::DictionaryValue> value(
       sync_ui_util::ConstructAboutInformation(service()));
   std::string service_status;
   base::JSONWriter::WriteWithOptions(value.get(),
                                      base::JSONWriter::OPTIONS_PRETTY_PRINT,
                                      &service_status);
   return service_status;
 }