Add support for GCM subtypes to desktop Instance ID implementation

google_apis/gcm/engine/gcm_request_test_base.h

Index: google_apis/gcm/engine/gcm_request_test_base.h
diff --git a/google_apis/gcm/engine/gcm_request_test_base.h b/google_apis/gcm/engine/gcm_request_test_base.h
index 8781dda837a1483162b6d5d4ca0722240888dbe8..3eb384d17af3e77b59c33ac3fbb133d19a7e254e 100644
--- a/google_apis/gcm/engine/gcm_request_test_base.h
+++ b/google_apis/gcm/engine/gcm_request_test_base.h
@@ -31,6 +31,12 @@ class GCMRequestTestBase : public testing::Test {
   // It can be overridden by the test class to add additional logic.
   virtual void CompleteFetch();
 
+  // Verifies that the Fetcher's upload_data exactly matches the given
+  // properties. The map will be cleared as a side-effect. Wrap calls to this
+  // with ASSERT_NO_FATAL_FAILURE.
+  void VerifyFetcherUploadData(
+      std::map<std::string, std::string>* expected_pairs);
+
   net::URLRequestContextGetter* url_request_context_getter() const {
     return url_request_context_getter_.get();
   }