Move code from sync/api/attachments to sync/internal_api/attachments.

The goal is to reorganize the sync attachment code so that in the future
attachment code can include stuff it needs (like src/net/) without
loosening the DEPS rules for the rest of sync.

Replace internal_api's coarse grained dep on net/ with finer grained
deps.

sync/api/attachments - Home to attachment code that's needed by both
sync itself and users of sync.

sync/internal_api/public/attachments - Home to attachment headers needed
by sync/api/attachments.

sync/internal_api/attachments - Home to attachment code that's private
to sync.

TBR=mef,erikwright,phajdan.jr

BUG=

Review URL: https://codereview.chromium.org/270633005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269481 0039d316-1c4b-4281-b951-d872f2087c98

17 files changed, 31 insertions, 27 deletions

diff --git a/chrome/browser/sync/glue/shared_change_processor.cc b/chrome/browser/sync/glue/shared_change_processor.cc
index eb29911..e4d9ec6 100644
--- a/chrome/browser/sync/glue/shared_change_processor.cc
+++ b/chrome/browser/sync/glue/shared_change_processor.cc
@@ -10,8 +10,8 @@
 #include "components/sync_driver/sync_api_component_factory.h"
 #include "sync/api/attachments/attachment_service.h"
 #include "sync/api/attachments/fake_attachment_service.h"
-#include "sync/api/attachments/fake_attachment_uploader.h"
 #include "sync/api/sync_change.h"
+#include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
 
 using base::AutoLock;
 
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index 4ba88f4..9594e8a 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -59,9 +59,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "sync/api/attachments/attachment_service.h"
-#include "sync/api/attachments/fake_attachment_service.h"
-#include "sync/api/attachments/fake_attachment_store.h"
 #include "sync/api/syncable_service.h"
+#include "sync/internal_api/public/attachments/fake_attachment_store.h"
 
 #if defined(ENABLE_EXTENSIONS)
 #include "chrome/browser/extensions/api/storage/settings_sync_util.h"
diff --git a/chrome/browser/sync/profile_sync_components_factory_mock.cc b/chrome/browser/sync/profile_sync_components_factory_mock.cc
index eaf5aea..b8b32f0 100644
--- a/chrome/browser/sync/profile_sync_components_factory_mock.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_mock.cc
@@ -6,7 +6,7 @@
 #include "components/sync_driver/change_processor.h"
 #include "components/sync_driver/model_associator.h"
 #include "content/public/browser/browser_thread.h"
-#include "sync/api/attachments/fake_attachment_store.h"
+#include "sync/internal_api/public/attachments/fake_attachment_store.h"
 
 using browser_sync::AssociatorInterface;
 using browser_sync::ChangeProcessor;
diff --git a/components/sync_driver/generic_change_processor_unittest.cc b/components/sync_driver/generic_change_processor_unittest.cc
index 2434e89..c478652 100644
--- a/components/sync_driver/generic_change_processor_unittest.cc
+++ b/components/sync_driver/generic_change_processor_unittest.cc
@@ -10,11 +10,11 @@
 #include "base/strings/stringprintf.h"
 #include "components/sync_driver/data_type_error_handler_mock.h"
 #include "sync/api/attachments/fake_attachment_service.h"
-#include "sync/api/attachments/fake_attachment_store.h"
-#include "sync/api/attachments/fake_attachment_uploader.h"
 #include "sync/api/fake_syncable_service.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_merge_result.h"
+#include "sync/internal_api/public/attachments/fake_attachment_store.h"
+#include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/read_node.h"
 #include "sync/internal_api/public/read_transaction.h"
diff --git a/sync/api/attachments/fake_attachment_service.cc b/sync/api/attachments/fake_attachment_service.cc
index f86f380..922fa7b 100644
--- a/sync/api/attachments/fake_attachment_service.cc
+++ b/sync/api/attachments/fake_attachment_service.cc
@@ -7,8 +7,8 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "sync/api/attachments/attachment.h"
-#include "sync/api/attachments/fake_attachment_store.h"
-#include "sync/api/attachments/fake_attachment_uploader.h"
+#include "sync/internal_api/public/attachments/fake_attachment_store.h"
+#include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
 
 namespace syncer {
 
diff --git a/sync/internal_api/DEPS b/sync/internal_api/DEPS
index a6e2e4e..dec66bc 100644
--- a/sync/internal_api/DEPS
+++ b/sync/internal_api/DEPS
@@ -1,5 +1,9 @@
 include_rules = [
-  "+net",
+  "+net/base",
+  "+net/cookies",
+  "+net/http",
+  "+net/test",
+  "+net/url_request",
   "+sync/base",
   "+sync/engine",
   "+sync/js",
diff --git a/sync/internal_api/attachments/DEPS b/sync/internal_api/attachments/DEPS
new file mode 100644
index 0000000..50828ba
--- /dev/null
+++ b/sync/internal_api/attachments/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+sync/api/attachments",
+]
diff --git a/sync/api/attachments/fake_attachment_store.cc b/sync/internal_api/attachments/fake_attachment_store.cc
index 18dd927..40224bd 100644
--- a/sync/api/attachments/fake_attachment_store.cc
+++ b/sync/internal_api/attachments/fake_attachment_store.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/api/attachments/fake_attachment_store.h"
+#include "sync/internal_api/public/attachments/fake_attachment_store.h"
 
 #include "base/bind.h"
 #include "base/location.h"
diff --git a/sync/api/attachments/fake_attachment_store_unittest.cc b/sync/internal_api/attachments/fake_attachment_store_unittest.cc
index b8dc2a1..dffe3cf 100644
--- a/sync/api/attachments/fake_attachment_store_unittest.cc
+++ b/sync/internal_api/attachments/fake_attachment_store_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/api/attachments/fake_attachment_store.h"
+#include "sync/internal_api/public/attachments/fake_attachment_store.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
diff --git a/sync/api/attachments/fake_attachment_uploader.cc b/sync/internal_api/attachments/fake_attachment_uploader.cc
index 7ed929d..e73ea6b 100644
--- a/sync/api/attachments/fake_attachment_uploader.cc
+++ b/sync/internal_api/attachments/fake_attachment_uploader.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/api/attachments/fake_attachment_uploader.h"
+#include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
diff --git a/sync/api/attachments/fake_attachment_uploader_unittest.cc b/sync/internal_api/attachments/fake_attachment_uploader_unittest.cc
index 09dccfc..2cfd75e 100644
--- a/sync/api/attachments/fake_attachment_uploader_unittest.cc
+++ b/sync/internal_api/attachments/fake_attachment_uploader_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/api/attachments/fake_attachment_uploader.h"
+#include "sync/internal_api/public/attachments/fake_attachment_uploader.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
diff --git a/sync/internal_api/http_bridge.cc b/sync/internal_api/http_bridge.cc
index fe700f8..ffcaf9a 100644
--- a/sync/internal_api/http_bridge.cc
+++ b/sync/internal_api/http_bridge.cc
@@ -10,11 +10,9 @@
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/cookies/cookie_monster.h"
-#include "net/dns/host_resolver.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_response_headers.h"
-#include "net/proxy/proxy_service.h"
 #include "net/url_request/static_http_user_agent_settings.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context.h"
diff --git a/sync/api/attachments/fake_attachment_store.h b/sync/internal_api/public/attachments/fake_attachment_store.h
index 35fad17..5bd59b63 100644
--- a/sync/api/attachments/fake_attachment_store.h
+++ b/sync/internal_api/public/attachments/fake_attachment_store.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_API_ATTACHMENTS_FAKE_ATTACHMENT_STORE_H_
-#define SYNC_API_ATTACHMENTS_FAKE_ATTACHMENT_STORE_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_FAKE_ATTACHMENT_STORE_H_
+#define SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_FAKE_ATTACHMENT_STORE_H_
 
 #include <map>
 
@@ -57,4 +57,4 @@ class SYNC_EXPORT FakeAttachmentStore : public AttachmentStore {
 
 }  // namespace syncer
 
-#endif  // SYNC_API_ATTACHMENTS_FAKE_ATTACHMENT_STORE_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_FAKE_ATTACHMENT_STORE_H_
diff --git a/sync/api/attachments/fake_attachment_uploader.h b/sync/internal_api/public/attachments/fake_attachment_uploader.h
index 7e48d61..91a35dc 100644
--- a/sync/api/attachments/fake_attachment_uploader.h
+++ b/sync/internal_api/public/attachments/fake_attachment_uploader.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SYNC_API_ATTACHMENTS_FAKE_ATTACHMENT_UPLOADER_H_
-#define SYNC_API_ATTACHMENTS_FAKE_ATTACHMENT_UPLOADER_H_
+#ifndef SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_FAKE_ATTACHMENT_UPLOADER_H_
+#define SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_FAKE_ATTACHMENT_UPLOADER_H_
 
 #include "base/threading/non_thread_safe.h"
 #include "sync/api/attachments/attachment_uploader.h"
@@ -27,4 +27,4 @@ class SYNC_EXPORT FakeAttachmentUploader : public AttachmentUploader,
 
 }  // namespace syncer
 
-#endif  // SYNC_API_ATTACHMENTS_FAKE_ATTACHMENT_UPLOADER_H_
+#endif  // SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_FAKE_ATTACHMENT_UPLOADER_H_
diff --git a/sync/sync_api.gypi b/sync/sync_api.gypi
index dfe05f8..ec3bc7f 100644
--- a/sync/sync_api.gypi
+++ b/sync/sync_api.gypi
@@ -29,10 +29,6 @@
     'api/attachments/attachment_uploader.h',
     'api/attachments/fake_attachment_service.cc',
     'api/attachments/fake_attachment_service.h',
-    'api/attachments/fake_attachment_store.cc',
-    'api/attachments/fake_attachment_store.h',
-    'api/attachments/fake_attachment_uploader.cc',
-    'api/attachments/fake_attachment_uploader.h',
     'api/string_ordinal.h',
     'api/syncable_service.cc',
     'api/syncable_service.h',
diff --git a/sync/sync_internal_api.gypi b/sync/sync_internal_api.gypi
index 6f9af0328..377fcbb 100644
--- a/sync/sync_internal_api.gypi
+++ b/sync/sync_internal_api.gypi
@@ -16,6 +16,8 @@
     '../url/url.gyp:url_lib',
   ],
   'sources': [
+    'internal_api/attachments/fake_attachment_store.cc',
+    'internal_api/attachments/fake_attachment_uploader.cc',
     'internal_api/base_node.cc',
     'internal_api/base_transaction.cc',
     'internal_api/change_record.cc',
@@ -43,6 +45,8 @@
     'internal_api/non_blocking_type_processor.cc',
     'internal_api/protocol_event_buffer.cc',
     'internal_api/protocol_event_buffer.h',
+    'internal_api/public/attachments/fake_attachment_store.h',
+    'internal_api/public/attachments/fake_attachment_uploader.h',
     'internal_api/public/base/ack_handle.cc',
     'internal_api/public/base/ack_handle.h',
     'internal_api/public/base/attachment_id_proto.cc',
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 4bb0c7aea..ea15c76 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -424,6 +424,8 @@
           '..',
         ],
         'sources': [
+          'internal_api/attachments/fake_attachment_store_unittest.cc',
+          'internal_api/attachments/fake_attachment_uploader_unittest.cc',
           'internal_api/debug_info_event_listener_unittest.cc',
           'internal_api/http_bridge_unittest.cc',
           'internal_api/js_mutation_event_observer_unittest.cc',
@@ -481,8 +483,6 @@
           'api/attachments/attachment_unittest.cc',
           'api/attachments/attachment_id_unittest.cc',
           'api/attachments/attachment_service_proxy_unittest.cc',
-          'api/attachments/fake_attachment_store_unittest.cc',
-          'api/attachments/fake_attachment_uploader_unittest.cc',
           'api/sync_change_unittest.cc',
           'api/sync_data_unittest.cc',
           'api/sync_error_unittest.cc',