| Index: components/sync/base/weak_handle_unittest.cc
|
| diff --git a/sync/internal_api/public/util/weak_handle_unittest.cc b/components/sync/base/weak_handle_unittest.cc
|
| similarity index 96%
|
| rename from sync/internal_api/public/util/weak_handle_unittest.cc
|
| rename to components/sync/base/weak_handle_unittest.cc
|
| index b7414dc7f733b26b62a94ab36215fbe1f8509bd6..94a8b01a7e0e42d915c983a30357bdbb0c6faec5 100644
|
| --- a/sync/internal_api/public/util/weak_handle_unittest.cc
|
| +++ b/components/sync/base/weak_handle_unittest.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "sync/internal_api/public/util/weak_handle.h"
|
| +#include "components/sync/base/weak_handle.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/compiler_specific.h"
|
| @@ -28,9 +28,7 @@ class Base {
|
| return MakeWeakHandle(weak_ptr_factory_.GetWeakPtr());
|
| }
|
|
|
| - void Kill() {
|
| - weak_ptr_factory_.InvalidateWeakPtrs();
|
| - }
|
| + void Kill() { weak_ptr_factory_.InvalidateWeakPtrs(); }
|
|
|
| MOCK_METHOD0(Test, void());
|
| MOCK_METHOD1(Test1, void(const int&));
|
| @@ -53,9 +51,7 @@ class WeakHandleTest : public ::testing::Test {
|
| PumpLoop();
|
| }
|
|
|
| - void PumpLoop() {
|
| - base::RunLoop().RunUntilIdle();
|
| - }
|
| + void PumpLoop() { base::RunLoop().RunUntilIdle(); }
|
|
|
| static void CallTestFromOtherThread(tracked_objects::Location from_here,
|
| const WeakHandle<Base>& h) {
|
| @@ -296,8 +292,7 @@ TEST_F(WeakHandleTest, TypeConversionConstructorMakeWeakHandle) {
|
| }
|
|
|
| TEST_F(WeakHandleTest, TypeConversionConstructorAssignment) {
|
| - const WeakHandle<Derived> weak_handle =
|
| - MakeWeakHandle(Derived().AsWeakPtr());
|
| + const WeakHandle<Derived> weak_handle = MakeWeakHandle(Derived().AsWeakPtr());
|
|
|
| // Should trigger type conversion constructor before the assignment.
|
| WeakHandle<Base> base_weak_handle;
|
|
|