Revert 96573 - sync: more DEPS fun

Hopefully this isn't too draconian.

BUG=19878
TEST=none

Review URL: http://codereview.chromium.org/7634002

TBR=tim@chromium.org
Review URL: http://codereview.chromium.org/7634030

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

chrome/browser/sync/api/DEPS

-include_rules = [
-  "-chrome",
-
-  "+chrome/browser/sync/api",
-  "+chrome/browser/sync/protocol",
-  "+chrome/browser/sync/syncable/model_type.h",
-]
-

chrome/browser/sync/engine/DEPS

@@ -3,16 +3,10 @@ include_rules = [
   "+chrome/test/base",
   "+chrome/test/sync",
 
-  "+chrome/browser/sync/engine",
-  "+chrome/browser/sync/js",
-  "+chrome/browser/sync/notifier",
-  "+chrome/browser/sync/protocol",
-  "+chrome/browser/sync/sessions",
-  "+chrome/browser/sync/syncable",
-  "+chrome/browser/sync/util",
-
-  # this should live in base
-  "+chrome/browser/sync/weak_handle.h",
+  # TODO(tim): Restrict this further.
+  "+chrome/browser/sync",
+  "-chrome/browser/sync/api",
+  "-chrome/browser/sync/glue",
 
   # unittests need this for mac osx keychain overriding
   "+chrome/browser/password_manager/encryptor.h",

chrome/browser/sync/glue/DEPS

-include_rules = [
-  "-chrome/browser/sync/engine",
-  "-chrome/browser/sync/notifier",
-  "-chrome/browser/sync/sessions",
-  "-chrome/browser/sync/syncable",
-  "-chrome/browser/sync/util",
-
-  # Should these live in their own "includes" (e.g) directory(ies)?
-  # Bug 19878.
-  "+chrome/browser/sync/engine/configure_reason.h",
-  "+chrome/browser/sync/engine/http_post_provider_factory.h",
-  "+chrome/browser/sync/engine/http_post_provider_interface.h",
-  "+chrome/browser/sync/engine/model_safe_worker.h",
-  "+chrome/browser/sync/engine/syncapi.h",
-  "+chrome/browser/sync/notifier/sync_notifier.h",
-  "+chrome/browser/sync/notifier/sync_notifier_factory.h",
-  "+chrome/browser/sync/syncable/model_type.h",
-  "+chrome/browser/sync/sessions/session_state.h",
-
-  # Mocks.
-  "+chrome/browser/sync/engine/read_node_mock.h",
-  "+chrome/browser/sync/engine/syncapi_mock.h",
-  "+chrome/browser/sync/syncable/syncable_mock.h",
-
-  # TODO(zea): SessionModelAssociator shouldn't need this.
-  "+chrome/browser/sync/syncable/syncable.h",
-
-  # TODO(tim): This shouldn't be needed.
-  "+chrome/browser/sync/syncable/directory_manager.h",
-  "+chrome/browser/sync/util/cryptographer.h"
-
-]
-

chrome/browser/sync/glue/app_model_associator.cc

@@ -8,6 +8,7 @@
 #include "base/tracked.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
 #include "chrome/browser/sync/api/sync_error.h"
+#include "chrome/browser/sync/engine/nigori_util.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/extension_sync_traits.h"
 #include "chrome/browser/sync/glue/extension_sync.h"

chrome/browser/sync/glue/bookmark_model_associator.cc

@@ -15,6 +15,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/api/sync_error.h"
+#include "chrome/browser/sync/engine/nigori_util.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/util/cryptographer.h"

chrome/browser/sync/glue/change_processor_mock.h

@@ -8,6 +8,7 @@
 
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/change_processor.h"
+#include "chrome/browser/sync/syncable/syncable.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 class Profile;

chrome/browser/sync/glue/extension_model_associator.cc

@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "base/tracked.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
+#include "chrome/browser/sync/engine/nigori_util.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/extension_sync_traits.h"
 #include "chrome/browser/sync/glue/extension_sync.h"

chrome/browser/sync/glue/generic_change_processor.cc

@@ -9,6 +9,7 @@
 #include "chrome/browser/sync/api/syncable_service.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/sync/api/sync_error.h"
+#include "chrome/browser/sync/engine/nigori_util.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/unrecoverable_error_handler.h"
 

chrome/browser/sync/glue/sync_backend_host.cc

@@ -17,6 +17,7 @@
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/sync/engine/nigori_util.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/autofill_model_associator.h"
 #include "chrome/browser/sync/glue/autofill_profile_model_associator.h"

chrome/browser/sync/js/DEPS

-include_rules = [
-  "-chrome",
-  "+chrome/test/sync",
-
-  "+chrome/browser/sync/js",
-
-  # The following should live in their own "includes" directory(ies).
-  # Bug 19878.
-  "+chrome/browser/sync/engine/syncapi.h",
-  "+chrome/browser/sync/sessions/session_state.h",
-  "+chrome/browser/sync/syncable/model_type.h",
-  "+chrome/browser/sync/syncable/transaction_observer.h",
-
-  # TODO(akalin): this should be in base.
-  "+chrome/browser/sync/weak_handle.h",
-  "+chrome/browser/sync/shared_value.h",
-
-]
-

chrome/browser/sync/notifier/DEPS

 include_rules = [
-  "-chrome",
-
-  "+chrome/test/base",
-
-  "+chrome/browser/sync/notifier",
-  "+chrome/browser/sync/syncable/model_type.h",
-  "+chrome/browser/sync/syncable/model_type_payload_map.h",
-  "+chrome/browser/sync/protocol/service_constants.h",
-
-  "+chrome/common/chrome_switches.h",
+  # sync_notifier depends on cacheinvalidation.
   "+google/cacheinvalidation",
+  # sync_notifier depends on the common jingle notifier classes.
   "+jingle/notifier",
-
   # unit tests depend on talk/base.
   "+talk/base",
   # sync_notifier depends on the xmpp part of libjingle.

chrome/browser/sync/protocol/DEPS

-include_rules = [
-  "-chrome",
-  "+chrome/browser/sync/protocol",
-  "+chrome/browser/sync/syncable/model_type.h",
-]
-

chrome/browser/sync/sessions/DEPS

@@ -3,10 +3,10 @@ include_rules = [
   "+chrome/test/base",
   "+chrome/test/sync",
 
-  "+chrome/browser/sync/engine",
-  "+chrome/browser/sync/protocol",
-  "+chrome/browser/sync/sessions",
-  "+chrome/browser/sync/syncable",
-  "+chrome/browser/sync/util",
+  # TODO(tim): Restrict this further.
+  "+chrome/browser/sync",
+  "-chrome/browser/sync/api",
+  "-chrome/browser/sync/glue",
+  "-chrome/browser/sync/notifier",
 ]
 

chrome/browser/sync/syncable/DEPS

@@ -3,10 +3,12 @@ include_rules = [
   "+chrome/test/base",
   "+chrome/test/sync",
 
-  "+chrome/browser/sync/protocol",
-  "+chrome/browser/sync/sessions",
-  "+chrome/browser/sync/syncable",
-  "+chrome/browser/sync/util",
+  # TODO(tim): Restrict this further.
+  "+chrome/browser/sync",
+  "-chrome/browser/sync/api",
+  "-chrome/browser/sync/engine",
+  "-chrome/browser/sync/glue",
+  "-chrome/browser/sync/notifier",
 
   # this file is wierd.
   "+chrome/browser/sync/engine/syncproto.h",