| OLD | NEW | 
|    1 // Copyright 2016 The Chromium Authors. All rights reserved. |    1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
|    2 // Use of this source code is governed by a BSD-style license that can be |    2 // Use of this source code is governed by a BSD-style license that can be | 
|    3 // found in the LICENSE file. |    3 // found in the LICENSE file. | 
|    4  |    4  | 
|    5 #include "blimp/helium/lww_register.h" |    5 #include "blimp/helium/lww_register.h" | 
|    6  |    6  | 
|    7 #include <memory> |    7 #include <memory> | 
|    8 #include <string> |    8 #include <string> | 
|    9  |    9  | 
|   10 #include "base/bind.h" |   10 #include "base/bind.h" | 
|   11 #include "base/macros.h" |   11 #include "base/macros.h" | 
 |   12 #include "base/memory/ptr_util.h" | 
|   12 #include "blimp/helium/helium_test.h" |   13 #include "blimp/helium/helium_test.h" | 
|   13 #include "blimp/helium/revision_generator.h" |   14 #include "blimp/helium/revision_generator.h" | 
|   14 #include "blimp/helium/version_vector.h" |   15 #include "blimp/helium/version_vector.h" | 
|   15 #include "testing/gmock/include/gmock/gmock.h" |   16 #include "testing/gmock/include/gmock/gmock.h" | 
|   16 #include "testing/gtest/include/gtest/gtest.h" |   17 #include "testing/gtest/include/gtest/gtest.h" | 
|   17 #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite
     .h" |   18 #include "third_party/protobuf/src/google/protobuf/io/zero_copy_stream_impl_lite
     .h" | 
|   18  |   19  | 
|   19 namespace blimp { |   20 namespace blimp { | 
|   20 namespace helium { |   21 namespace helium { | 
|   21 namespace { |   22 namespace { | 
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  148   client_->Set(123); |  149   client_->Set(123); | 
|  149   engine_->Set(456); |  150   engine_->Set(456); | 
|  150   Sync(*client_, engine_.get()); |  151   Sync(*client_, engine_.get()); | 
|  151  |  152  | 
|  152   EXPECT_EQ(456, engine_->Get()); |  153   EXPECT_EQ(456, engine_->Get()); | 
|  153 } |  154 } | 
|  154  |  155  | 
|  155 }  // namespace |  156 }  // namespace | 
|  156 }  // namespace helium |  157 }  // namespace helium | 
|  157 }  // namespace blimp |  158 }  // namespace blimp | 
| OLD | NEW |