Add support for GCM subtypes to desktop Instance ID implementation

google_apis/gcm/engine/gcm_request_test_base.h

 // Copyright 2015 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 "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/backoff_entry.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ skipping 13 matching lines @@
   net::TestURLFetcher* GetFetcher() const;
 
   // Set the response status and body that will be returned by the URL fetch.
   void SetResponse(net::HttpStatusCode status_code,
                    const std::string& response_body);
 
   // Completes the URL fetch.
   // 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(

[Nicolas Zea, 2016/08/17 20:54:09]

optional suggestion: it might make sense to return an AssertionResult here
instead of requiring the caller to wrap the method in an
ASSERT_NO_FATAL_FAILURE. In my mind having an AssertionResult makes it clearer
that the responsibility is on the caller to handle the result (and it also makes
it easier to trace where the failure happened). 

[johnme, 2016/08/18 17:43:21]

Hmm, on the other hand it seems that would make the implementation less clear,
since each of the 5 ASSERT_ statements would go from one line to two, and the
ASSERT_EQs would have to manually construct error strings, which is currently
handled for them automatically.
Actually, perhaps the opposite. With ASSERT_NO_FATAL_FAILURE you can nest them,
i.e. if MyTest calls ASSERT_NO_FATAL_FAILURE(Foo()) where Foo itself calls
ASSERT_NO_FATAL_FAILURE(Bar()), the error message will explain the full chain
(MyTest line -> Foo line -> Bar line -> actual assertion failure). Whereas with
ASSERT_TRUE(ReturnsAssertionResult()), you only see the outermost ASSERT_TRUE in
MyTest and the innermost error message.

+      std::map<std::string, std::string>* expected_pairs);
+
   net::URLRequestContextGetter* url_request_context_getter() const {
     return url_request_context_getter_.get();
   }
 
  private:
   // Fast forward the timer used in the test to retry the request immediately.
   void FastForwardToTriggerNextRetry();
 
   scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
 
   net::TestURLFetcherFactory url_fetcher_factory_;
 
   // Tracks the number of retries so far.
   int retry_count_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMRequestTestBase);
 };
 
 }  // namespace gcm