Revert of [GCM] Start GCMChannelStatusSyncer when GCM is disabled

chrome/browser/services/gcm/gcm_desktop_utils.cc

 // Copyright 2014 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/services/gcm/gcm_desktop_utils.h"
 
-#include "base/command_line.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/sync/glue/local_device_info_provider_impl.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/gcm_driver/gcm_driver_desktop.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace gcm {
 
 namespace {
 
-const char kChannelStatusRelativePath[] = "/experimentstatus";
-
 GCMClient::ChromePlatform GetPlatform() {
 #if defined(OS_WIN)
   return GCMClient::PLATFORM_WIN;
 #elif defined(OS_MACOSX)
   return GCMClient::PLATFORM_MAC;
 #elif defined(OS_IOS)
   return GCMClient::PLATFORM_IOS;
 #elif defined(OS_ANDROID)
   return GCMClient::PLATFORM_ANDROID;
 #elif defined(OS_CHROMEOS)
@@ skipping 32 matching lines @@
 
 GCMClient::ChromeBuildInfo GetChromeBuildInfo() {
   GCMClient::ChromeBuildInfo chrome_build_info;
   chrome_build_info.platform = GetPlatform();
   chrome_build_info.channel = GetChannel();
   chrome_build_info.version = GetVersion();
   return chrome_build_info;
 }
 
 std::string GetChannelStatusRequestUrl() {
-  GURL sync_url(
-      ProfileSyncService::GetSyncServiceURL(*CommandLine::ForCurrentProcess()));
-  return sync_url.spec() + kChannelStatusRelativePath;
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel == chrome::VersionInfo::CHANNEL_STABLE ||
+      channel == chrome::VersionInfo::CHANNEL_BETA) {
+    return ProfileSyncService::kSyncServerUrl;
+  }
+
+  return ProfileSyncService::kDevServerUrl;
 }
 
 std::string GetUserAgent() {
   chrome::VersionInfo version_info;
   return browser_sync::LocalDeviceInfoProviderImpl::MakeUserAgentForSyncApi(
       version_info);
 }
 
 }  // namespace
 
@@ skipping 17 matching lines @@
                            store_path,
                            request_context,
                            content::BrowserThread::GetMessageLoopProxyForThread(
                                content::BrowserThread::UI),
                            content::BrowserThread::GetMessageLoopProxyForThread(
                                content::BrowserThread::IO),
                            blocking_task_runner));
 }
 
 }  // namespace gcm