Helium: Fix flaky test

blimp/helium/compound_syncable_unittest.cc

 // Copyright 2016 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 "blimp/helium/compound_syncable.h"
 
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "blimp/helium/helium_test.h"
 #include "blimp/helium/lww_register.h"
 #include "blimp/helium/revision_generator.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/protobuf/src/google/protobuf/io/coded_stream.h"
 #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite.h"
 
 namespace blimp {
 namespace helium {
 namespace {
 
 class SampleCompoundSyncable : public CompoundSyncable {
  public:
   explicit SampleCompoundSyncable(Peer bias, Peer running_as)
       : child1_(
             CreateAndRegister<LwwRegister<int>>(bias, running_as)),
         child2_(
             CreateAndRegister<LwwRegister<int>>(bias, running_as)) {}
 
   LwwRegister<int>* mutable_child1() { return child1_.get(); }
   LwwRegister<int>* mutable_child2() { return child2_.get(); }
 
  private:
   RegisteredMember<LwwRegister<int>> child1_;
   RegisteredMember<LwwRegister<int>> child2_;
 
   DISALLOW_COPY_AND_ASSIGN(SampleCompoundSyncable);
 };
 
-class CompoundSyncableTest : public testing::Test {
+class CompoundSyncableTest : public HeliumTest {
  public:
   CompoundSyncableTest()
       : last_sync_engine_(0),
         engine_(Peer::ENGINE, Peer::ENGINE),
         client_(Peer::ENGINE, Peer::CLIENT) {}
 
   ~CompoundSyncableTest() override {}
 
  protected:
   // Propagates pending changes from |engine_| to |client_|.
@@ skipping 53 matching lines @@
   EXPECT_EQ(123, client_.mutable_child1()->Get());
   engine_.mutable_child2()->Set(456);
   Synchronize();
   EXPECT_EQ(123, client_.mutable_child1()->Get());
   EXPECT_EQ(456, client_.mutable_child2()->Get());
 }
 
 }  // namespace
 }  // namespace helium
 }  // namespace blimp