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 "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_ANDROID)
+#include "components/gcm_driver/instance_id/instance_id_android.h"
+#include "components/gcm_driver/instance_id/instance_id_test_utils_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 15 matching lines @@
 
 }  // namespace
 
 class InstanceIDDriverTest : public testing::Test {
  public:
   InstanceIDDriverTest();
   ~InstanceIDDriverTest() override;
 
   // testing::Test:
   void SetUp() override;
+  void TearDown() override;
 
   void WaitForAsyncOperation();
 
   // Recreates InstanceIDDriver to simulate restart.
   void RecreateInstanceIDDriver();
 
   // Sync wrappers for async version.
   std::string GetID(InstanceID* instance_id);
   base::Time GetCreationTime(InstanceID* instance_id);
   InstanceID::Result DeleteID(InstanceID* instance_id);
@@ skipping 33 matching lines @@
 
 InstanceIDDriverTest::InstanceIDDriverTest()
     : result_(InstanceID::UNKNOWN_ERROR),
       async_operation_completed_(false) {
 }
 
 InstanceIDDriverTest::~InstanceIDDriverTest() {
 }
 
 void InstanceIDDriverTest::SetUp() {
+#if defined(OS_ANDROID)
+  InstanceIDAndroid::SetBlockOnAsyncTasksForTesting(true);
+  InstanceIDTestUtilsAndroid::ClearDataAndSetUseFakeForTesting(true);

[Peter Beverloo, 2016/04/18 15:46:36]

Would we ever used them separately? Could trigger
InstanceIDAndroid::SetBlockOnAsyncTasksForTesting from
InstanceIDTestUtilsAndroid otherwise.

Could also make one of these super awesome scoped objects that do this
automagically for you :P

[johnme, 2016/04/19 11:15:43]

I made them scoped objects. I left them separate for now, since it would be
reasonable for tests to use ScopedUseFakeInstanceIDAndroid but not
ScopedBlockOnAsyncTasksForTesting if they have a nested Java loop like the
upcoming Android browser_tests presumably will, (or
ScopedBlockOnAsyncTasksForTesting but not ScopedUseFakeInstanceIDAndroid if they
want to test against live GCM, but don't have a nested Java loop).

+#endif  // OS_ANDROID
   gcm_driver_.reset(new FakeGCMDriverForInstanceID);
   RecreateInstanceIDDriver();
 }
 
+void InstanceIDDriverTest::TearDown() {
+#if defined(OS_ANDROID)
+  InstanceIDTestUtilsAndroid::ClearDataAndSetUseFakeForTesting(false);
+  InstanceIDAndroid::SetBlockOnAsyncTasksForTesting(false);
+#endif  // OS_ANDROID
+}
+
 void InstanceIDDriverTest::RecreateInstanceIDDriver() {
   driver_.reset(new InstanceIDDriver(gcm_driver_.get()));
 }
 
 void InstanceIDDriverTest::WaitForAsyncOperation() {
   // No need to wait if async operation is not needed.
   if (async_operation_completed_)
     return;
   base::RunLoop run_loop;
   async_operation_completed_callback_ = run_loop.QuitClosure();
@@ skipping 229 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