Client-to-server messages in GCMNetworkChannel

chrome/browser/invalidation/ticl_invalidation_service.cc

 // Copyright (c) 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/invalidation/ticl_invalidation_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/invalidation/invalidation_service_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/about_signin_internals.h"
 #include "chrome/browser/signin/about_signin_internals_factory.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.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_constants.h"
+#include "sync/notifier/gcm_network_channel_delegate.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/invalidator_state.h"
 #include "sync/notifier/non_blocking_invalidator.h"
 
 static const char* kOAuth2Scopes[] = {
   GaiaConstants::kGoogleTalkOAuth2Scope
 };
 
 static const net::BackoffEntry::Policy kRequestAccessTokenBackoffPolicy = {
   // Number of initial errors (in sequence) to ignore before applying
@@ skipping 306 matching lines @@
       notifier::NotifierOptions options =
           ParseNotifierOptions(*CommandLine::ForCurrentProcess());
       options.request_context_getter = profile_->GetRequestContext();
       options.auth_mechanism = "X-OAUTH2";
       DCHECK_EQ(notifier::NOTIFICATION_SERVER, options.notification_method);
       network_channel_creator =
           syncer::NonBlockingInvalidator::MakePushClientChannelCreator(options);
       break;
     }
     case GCM_NETWORK_CHANNEL: {
+      // TODO(pavely): Pass NULL pointer for now. When GCMNetworkChannelDelegate
+      // is implemented it will be instantiated and passed here.
+      scoped_ptr<syncer::GCMNetworkChannelDelegate> delegate;
       network_channel_creator =
-          syncer::NonBlockingInvalidator::MakeGCMNetworkChannelCreator();
+          syncer::NonBlockingInvalidator::MakeGCMNetworkChannelCreator(
+              profile_->GetRequestContext(),
+              delegate.Pass());
       break;
     }
     default: {
       NOTREACHED();
       return;
     }
   }
   invalidator_.reset(new syncer::NonBlockingInvalidator(
           network_channel_creator,
           invalidator_storage_->GetInvalidatorClientId(),
@@ skipping 36 matching lines @@
   }
 
   // This service always expects to have a valid invalidator storage.
   // So we must not only clear the old one, but also start a new one.
   invalidator_storage_->Clear();
   invalidator_storage_.reset(new InvalidatorStorage(profile_->GetPrefs()));
   invalidator_storage_->SetInvalidatorClientId(GenerateInvalidatorClientId());
 }
 
 }  // namespace invalidation