chrome/browser/sync/internal_api/syncapi_unittest.cc - Issue 9699057: [Sync] Move 'sync' target to sync/

Unified Diff: chrome/browser/sync/internal_api/syncapi_unittest.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address Tim's comments Created 8 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/browser/sync/internal_api/syncapi_server_connection_manager.h ('k') | chrome/browser/sync/internal_api/user_share.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/internal_api/syncapi_unittest.cc

diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc

index 29a94f004cfad53069596238e5a8a5aa962528e1..d59d8efca01bcfd18c56533b5a8f8228ab43932e 100644

--- a/chrome/browser/sync/internal_api/syncapi_unittest.cc

+++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc

@@ -23,43 +23,43 @@

#include "base/test/values_test_util.h"

#include "base/utf_string_conversions.h"

#include "base/values.h"

-#include "chrome/browser/sync/engine/model_safe_worker.h"

-#include "chrome/browser/sync/engine/nigori_util.h"

-#include "chrome/browser/sync/engine/polling_constants.h"

-#include "chrome/browser/sync/engine/syncapi_internal.h"

+#include "chrome/browser/sync/internal_api/syncapi_internal.h"

#include "chrome/browser/sync/internal_api/change_record.h"

#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"

#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"

-#include "chrome/browser/sync/internal_api/includes/test_unrecoverable_error_handler.h"

#include "chrome/browser/sync/internal_api/read_node.h"

#include "chrome/browser/sync/internal_api/read_transaction.h"

#include "chrome/browser/sync/internal_api/sync_manager.h"

#include "chrome/browser/sync/internal_api/write_node.h"

#include "chrome/browser/sync/internal_api/write_transaction.h"

-#include "chrome/browser/sync/js/js_arg_list.h"

-#include "chrome/browser/sync/js/js_backend.h"

-#include "chrome/browser/sync/js/js_event_handler.h"

-#include "chrome/browser/sync/js/js_reply_handler.h"

-#include "chrome/browser/sync/js/js_test_util.h"

#include "chrome/browser/sync/notifier/sync_notifier.h"

#include "chrome/browser/sync/notifier/sync_notifier_observer.h"

-#include "chrome/browser/sync/protocol/proto_value_conversions.h"

-#include "chrome/browser/sync/sessions/sync_session.h"

-#include "chrome/browser/sync/syncable/model_type_test_util.h"

-#include "chrome/browser/sync/syncable/syncable.h"

-#include "chrome/browser/sync/syncable/syncable_id.h"

#include "chrome/browser/sync/test/engine/test_user_share.h"

-#include "chrome/browser/sync/test/fake_encryptor.h"

-#include "chrome/browser/sync/test/fake_extensions_activity_monitor.h"

-#include "chrome/browser/sync/util/cryptographer.h"

-#include "chrome/browser/sync/util/extensions_activity_monitor.h"

-#include "chrome/browser/sync/util/time.h"

+#include "sync/engine/model_safe_worker.h"

+#include "sync/engine/nigori_util.h"

+#include "sync/engine/polling_constants.h"

+#include "sync/js/js_arg_list.h"

+#include "sync/js/js_backend.h"

+#include "sync/js/js_event_handler.h"

+#include "sync/js/js_reply_handler.h"

+#include "sync/js/js_test_util.h"

#include "sync/protocol/bookmark_specifics.pb.h"

#include "sync/protocol/encryption.pb.h"

#include "sync/protocol/extension_specifics.pb.h"

#include "sync/protocol/password_specifics.pb.h"

#include "sync/protocol/preference_specifics.pb.h"

+#include "sync/protocol/proto_value_conversions.h"

#include "sync/protocol/sync.pb.h"

+#include "sync/sessions/sync_session.h"

+#include "sync/syncable/model_type_test_util.h"

+#include "sync/syncable/syncable.h"

+#include "sync/syncable/syncable_id.h"

+#include "sync/test/fake_encryptor.h"

+#include "sync/test/fake_extensions_activity_monitor.h"

+#include "sync/util/cryptographer.h"

+#include "sync/util/extensions_activity_monitor.h"

+#include "sync/util/test_unrecoverable_error_handler.h"

+#include "sync/util/time.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"