Add support for GCM subtypes to desktop Instance ID implementation

components/gcm_driver/gcm_driver_desktop_unittest.cc

Index: components/gcm_driver/gcm_driver_desktop_unittest.cc
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc
index 7d20a7e95f224b24c11b444218a9ec9b6916dc80..232f3b0c3d2303ae5fb8b8010ff34c38c6b4d4f9 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -238,10 +238,12 @@ FakeGCMClient* GCMDriverTest::GetGCMClient() {
 void GCMDriverTest::CreateDriver() {
   scoped_refptr<net::URLRequestContextGetter> request_context =
       new net::TestURLRequestContextGetter(io_thread_.task_runner());
+  GCMClient::ChromeBuildInfo chrome_build_info;
+  chrome_build_info.category_for_subtypes = "com.chrome.stable.macosx";
   driver_.reset(new GCMDriverDesktop(
       std::unique_ptr<GCMClientFactory>(new FakeGCMClientFactory(
           base::ThreadTaskRunnerHandle::Get(), io_thread_.task_runner())),
-      GCMClient::ChromeBuildInfo(), "http://channel.status.request.url",
+      chrome_build_info, "http://channel.status.request.url",
       "user-agent-string", &prefs_, temp_dir_.path(), request_context,
       base::ThreadTaskRunnerHandle::Get(), io_thread_.task_runner(),
       message_loop_.task_runner()));
@@ -1226,7 +1228,7 @@ void GCMDriverInstanceIDTest::GetToken(const std::string& app_id,
   set_async_operation_completed_callback(run_loop.QuitClosure());
   std::map<std::string, std::string> options;
   driver()->GetInstanceIDHandlerInternal()->GetToken(
-      app_id, authorized_entity, scope, options,
+      app_id, false /* use_subtype */, authorized_entity, scope, options,
       base::Bind(&GCMDriverTest::RegisterCompleted, base::Unretained(this)));
   if (wait_to_finish == WAIT)
     run_loop.Run();
@@ -1239,7 +1241,7 @@ void GCMDriverInstanceIDTest::DeleteToken(const std::string& app_id,
   base::RunLoop run_loop;
   set_async_operation_completed_callback(run_loop.QuitClosure());
   driver()->GetInstanceIDHandlerInternal()->DeleteToken(
-      app_id, authorized_entity, scope,
+      app_id, false /* use_subtype */, authorized_entity, scope,
       base::Bind(&GCMDriverTest::UnregisterCompleted, base::Unretained(this)));
   if (wait_to_finish == WAIT)
     run_loop.Run();