| Index: components/sync/js/js_test_util.h
|
| diff --git a/sync/js/js_test_util.h b/components/sync/js/js_test_util.h
|
| similarity index 79%
|
| rename from sync/js/js_test_util.h
|
| rename to components/sync/js/js_test_util.h
|
| index b5ae4e8d78ae58c217cf94ffe89c3332c0370b30..234664d63513e79a90a95c2763515cab044db7a1 100644
|
| --- a/sync/js/js_test_util.h
|
| +++ b/components/sync/js/js_test_util.h
|
| @@ -2,17 +2,17 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef SYNC_JS_JS_TEST_UTIL_H_
|
| -#define SYNC_JS_JS_TEST_UTIL_H_
|
| +#ifndef COMPONENTS_SYNC_JS_JS_TEST_UTIL_H_
|
| +#define COMPONENTS_SYNC_JS_JS_TEST_UTIL_H_
|
|
|
| #include <ostream>
|
| #include <string>
|
|
|
| #include "base/memory/weak_ptr.h"
|
| -#include "sync/internal_api/public/util/weak_handle.h"
|
| -#include "sync/js/js_backend.h"
|
| -#include "sync/js/js_controller.h"
|
| -#include "sync/js/js_event_handler.h"
|
| +#include "components/sync/base/weak_handle.h"
|
| +#include "components/sync/js/js_backend.h"
|
| +#include "components/sync/js/js_controller.h"
|
| +#include "components/sync/js/js_event_handler.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace base {
|
| @@ -60,9 +60,8 @@ class MockJsController : public JsController,
|
| MOCK_METHOD1(RemoveJsEventHandler, void(JsEventHandler*));
|
| };
|
|
|
| -class MockJsEventHandler
|
| - : public JsEventHandler,
|
| - public base::SupportsWeakPtr<MockJsEventHandler> {
|
| +class MockJsEventHandler : public JsEventHandler,
|
| + public base::SupportsWeakPtr<MockJsEventHandler> {
|
| public:
|
| MockJsEventHandler();
|
| virtual ~MockJsEventHandler();
|
| @@ -75,4 +74,4 @@ class MockJsEventHandler
|
|
|
| } // namespace syncer
|
|
|
| -#endif // SYNC_JS_JS_TEST_UTIL_H_
|
| +#endif // COMPONENTS_SYNC_JS_JS_TEST_UTIL_H_
|
|
|