Add fake for InstanceIDWithSubtype.java, in order to re-use unit test

components/gcm_driver/instance_id/instance_id_driver_unittest.cc

 // 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 "components/gcm_driver/instance_id/instance_id_driver.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"
 #include "components/gcm_driver/instance_id/instance_id.h"
+#include "components/gcm_driver/instance_id/instance_id_test_utils_android.h"

[Peter Beverloo, 2016/04/15 00:00:18]

Stick this in the #ifdef too?

[johnme, 2016/04/15 16:00:43]

Done.

 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#include "components/gcm_driver/instance_id/instance_id_android.h"
+#endif  // OS_ANDROID
+
 namespace instance_id {
 
 namespace {
 
 const char kTestAppID1[] = "TestApp1";
 const char kTestAppID2[] = "TestApp2";
 const char kAuthorizedEntity1[] = "Sender 1";
 const char kAuthorizedEntity2[] = "Sender 2";
 const char kScope1[] = "GCM1";
 const char kScope2[] = "FooBar";
@@ skipping 68 matching lines @@
 
 InstanceIDDriverTest::InstanceIDDriverTest()
     : result_(InstanceID::UNKNOWN_ERROR),
       async_operation_completed_(false) {
 }
 
 InstanceIDDriverTest::~InstanceIDDriverTest() {
 }
 
 void InstanceIDDriverTest::SetUp() {
+#if defined(OS_ANDROID)
+  InstanceIDTestUtilsAndroid::ClearDataAndSetUseFakeForTesting(true);
+  InstanceIDAndroid::SetBlockOnAsyncTasksForTesting(true);

[Peter Beverloo, 2016/04/15 00:00:17]

Clean up as part of TearDown? They're statics so this could have side-effects
for other tests ran as part of the same process too.

[johnme, 2016/04/15 16:00:43]

Done (I'd been hoping to avoid the boilerplate, as it's never wrong for tests to
run with these statics enabled, but it might cause people to forget to enable
them in other tests, so fair enough).

+#endif  // OS_ANDROID
   gcm_driver_.reset(new FakeGCMDriverForInstanceID);
   RecreateInstanceIDDriver();
 }
 
 void InstanceIDDriverTest::RecreateInstanceIDDriver() {
   driver_.reset(new InstanceIDDriver(gcm_driver_.get()));
 }
 
 void InstanceIDDriverTest::WaitForAsyncOperation() {
   // No need to wait if async operation is not needed.
@@ skipping 233 matching lines @@
       GetToken(instance_id, kAuthorizedEntity1, kScope2, options);
   EXPECT_FALSE(new_token1.empty());
   EXPECT_NE(token1, new_token1);
 
   // The other token is not affected by the deletion.
   EXPECT_EQ(token2,
             GetToken(instance_id, kAuthorizedEntity2, kScope1, options));
 }
 
 }  // namespace instance_id