Small changes around 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 "base/prefs/pref_service.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
 #include "chrome/browser/invalidation/invalidation_auth_provider.h"
 #include "chrome/browser/invalidation/invalidation_logger.h"
 #include "chrome/browser/invalidation/invalidation_service_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/common/chrome_content_client.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/profile_oauth2_token_service.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "sync/notifier/gcm_network_channel_delegate.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/invalidator_state.h"
 #include "sync/notifier/non_blocking_invalidator.h"
 #include "sync/notifier/object_id_invalidation_map.h"
 
@@ skipping 395 matching lines @@
   invalidator_->RegisterHandler(this);
   invalidator_->UpdateRegisteredIds(
       this,
       invalidator_registrar_->GetAllRegisteredIds());
 }
 
 void TiclInvalidationService::UpdateInvalidationNetworkChannel() {
   InvalidationNetworkChannel network_channel_type = PUSH_CLIENT_CHANNEL;
 // For now don't use GCM on iOS.
 #if !defined(OS_IOS)
-  if (profile_->GetPrefs()->GetBoolean(
-          prefs::kInvalidationServiceUseGCMChannel) &&
-      gcm::GCMProfileService::GetGCMEnabledState(profile_) ==
-          gcm::GCMProfileService::ALWAYS_ENABLED) {
+  if (gcm::GCMProfileService::GetGCMEnabledState(profile_) ==
+          gcm::GCMProfileService::ALWAYS_ENABLED &&
+      (profile_->GetPrefs()->GetBoolean(
+           prefs::kInvalidationServiceUseGCMChannel) ||
+       CommandLine::ForCurrentProcess()->HasSwitch(
+           switches::kInvalidationUseGCMChannel))) {
     network_channel_type = GCM_NETWORK_CHANNEL;
   }
 #endif
   if (network_channel_type_ == network_channel_type)
     return;
   network_channel_type_ = network_channel_type;
   if (IsStarted()) {
     StopInvalidator();
     StartInvalidator(network_channel_type_);
   }
 }
 
 void TiclInvalidationService::UpdateInvalidatorCredentials() {
   std::string email = auth_provider_->GetAccountId();
 
   DCHECK(!email.empty()) << "Expected user to be signed in.";
 
   DVLOG(2) << "UpdateCredentials: " << email;
   invalidator_->UpdateCredentials(email, access_token_);
 }
 
 void TiclInvalidationService::StopInvalidator() {
   DCHECK(invalidator_);
   gcm_invalidation_bridge_.reset();
   invalidator_->UnregisterHandler(this);
   invalidator_.reset();
 }
 
 }  // namespace invalidation