Merging chrome/common/gcm_desktop_util.* and chrome/browser/services/gcm/gcm_desktop_util.*.

chrome/browser/services/gcm/gcm_desktop_utils.h

Index: chrome/browser/services/gcm/gcm_desktop_utils.h
diff --git a/chrome/browser/services/gcm/gcm_desktop_utils.h b/chrome/browser/services/gcm/gcm_desktop_utils.h
index 8105829d017233a59073fd6a942eb44204d2644d..ca2149c1a6ab24d6d3f9600f9c979a0d625bde88 100644
--- a/chrome/browser/services/gcm/gcm_desktop_utils.h
+++ b/chrome/browser/services/gcm/gcm_desktop_utils.h
@@ -11,6 +11,7 @@
 class PrefService;
 namespace base {
 class FilePath;
+class SequencedTaskRunner;
 }
 
 namespace net {
@@ -22,6 +23,15 @@ namespace gcm {
 class GCMDriver;
 class GCMClientFactory;
 
+scoped_ptr<GCMDriver> CreateGCMDriverDesktopWithTaskRunners(
+    scoped_ptr<GCMClientFactory> gcm_client_factory,
+    PrefService* prefs,
+    const base::FilePath& store_path,
+    const scoped_refptr<net::URLRequestContextGetter>& request_context,
+    const scoped_refptr<base::SequencedTaskRunner>& ui_thread,
+    const scoped_refptr<base::SequencedTaskRunner>& io_thread,
+    const scoped_refptr<base::SequencedTaskRunner>& blocking_task_runner);
+
 scoped_ptr<GCMDriver> CreateGCMDriverDesktop(
     scoped_ptr<GCMClientFactory> gcm_client_factory,
     PrefService* prefs,