Index: chrome/browser/services/gcm/gcm_desktop_utils.cc |
diff --git a/chrome/browser/services/gcm/gcm_desktop_utils.cc b/chrome/browser/services/gcm/gcm_desktop_utils.cc |
index b15dd9f78790906ab2c428946f7ec3248a845fca..83e817f73a933489515ca1f6d92ebbff243f75d5 100644 |
--- a/chrome/browser/services/gcm/gcm_desktop_utils.cc |
+++ b/chrome/browser/services/gcm/gcm_desktop_utils.cc |
@@ -9,10 +9,10 @@ |
#include "base/threading/sequenced_worker_pool.h" |
#include "chrome/browser/services/gcm/gcm_desktop_utils.h" |
#include "chrome/common/channel_info.h" |
-#include "chrome/common/sync_util.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 "components/sync_driver/sync_util.h" |
#include "components/version_info/version_info.h" |
#include "content/public/browser/browser_thread.h" |
#include "url/gurl.h" |
@@ -74,12 +74,13 @@ GCMClient::ChromeBuildInfo GetChromeBuildInfo() { |
} |
std::string GetChannelStatusRequestUrl() { |
- GURL sync_url(GetSyncServiceURL(*base::CommandLine::ForCurrentProcess())); |
+ GURL sync_url(GetSyncServiceURL(*base::CommandLine::ForCurrentProcess(), |
+ chrome::GetChannel())); |
return sync_url.spec() + kChannelStatusRelativePath; |
} |
std::string GetUserAgent() { |
- return MakeDesktopUserAgentForSync(); |
+ return MakeDesktopUserAgentForSync(chrome::GetChannel()); |
} |
} // namespace |
@@ -98,15 +99,10 @@ scoped_ptr<GCMDriver> CreateGCMDriverDesktop( |
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
return scoped_ptr<GCMDriver>(new GCMDriverDesktop( |
- gcm_client_factory.Pass(), |
- GetChromeBuildInfo(), |
- GetChannelStatusRequestUrl(), |
- GetUserAgent(), |
- prefs, |
- store_path, |
- request_context, |
- content::BrowserThread::GetMessageLoopProxyForThread( |
- content::BrowserThread::UI), |
+ gcm_client_factory.Pass(), GetChromeBuildInfo(), |
+ GetChannelStatusRequestUrl(), GetUserAgent(), prefs, store_path, |
+ request_context, content::BrowserThread::GetMessageLoopProxyForThread( |
+ content::BrowserThread::UI), |
content::BrowserThread::GetMessageLoopProxyForThread( |
content::BrowserThread::IO), |
blocking_task_runner)); |