diff options
Diffstat (limited to 'chrome/browser/sync/notifier')
21 files changed, 45 insertions, 43 deletions
diff --git a/chrome/browser/sync/notifier/DEPS b/chrome/browser/sync/notifier/DEPS index 7376cba..f856e1e 100644 --- a/chrome/browser/sync/notifier/DEPS +++ b/chrome/browser/sync/notifier/DEPS @@ -2,16 +2,17 @@ include_rules = [ "-chrome", "+chrome/browser/sync/notifier", - "+chrome/browser/sync/syncable/model_type.h", - "+chrome/browser/sync/syncable/model_type_payload_map.h", - "+chrome/browser/sync/syncable/model_type_test_util.h", - "+chrome/browser/sync/protocol/service_constants.h", - "+chrome/browser/sync/util", "+chrome/common/chrome_switches.h", "+google/cacheinvalidation", "+jingle/notifier", + "+sync/syncable/model_type.h", + "+sync/syncable/model_type_payload_map.h", + "+sync/syncable/model_type_test_util.h", + "+sync/protocol/service_constants.h", + "+sync/util", + # unit tests depend on talk/base. "+talk/base", # sync_notifier depends on the xmpp part of libjingle. diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.cc b/chrome/browser/sync/notifier/chrome_invalidation_client.cc index ece8e97..b4b499b 100644 --- a/chrome/browser/sync/notifier/chrome_invalidation_client.cc +++ b/chrome/browser/sync/notifier/chrome_invalidation_client.cc @@ -13,11 +13,11 @@ #include "chrome/browser/sync/notifier/cache_invalidation_packet_handler.h" #include "chrome/browser/sync/notifier/invalidation_util.h" #include "chrome/browser/sync/notifier/registration_manager.h" -#include "chrome/browser/sync/syncable/model_type.h" #include "google/cacheinvalidation/include/invalidation-client-factory.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/v2/types.pb.h" +#include "sync/syncable/model_type.h" namespace { diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client.h b/chrome/browser/sync/notifier/chrome_invalidation_client.h index 74622fd..3d103b0 100644 --- a/chrome/browser/sync/notifier/chrome_invalidation_client.h +++ b/chrome/browser/sync/notifier/chrome_invalidation_client.h @@ -19,10 +19,10 @@ #include "chrome/browser/sync/notifier/chrome_system_resources.h" #include "chrome/browser/sync/notifier/invalidation_version_tracker.h" #include "chrome/browser/sync/notifier/state_writer.h" -#include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/browser/sync/syncable/model_type_payload_map.h" -#include "chrome/browser/sync/util/weak_handle.h" #include "google/cacheinvalidation/include/invalidation-listener.h" +#include "sync/syncable/model_type.h" +#include "sync/syncable/model_type_payload_map.h" +#include "sync/util/weak_handle.h" // TODO(akalin): Move invalidation::InvalidationListener into its own // file and include that instead of invalidation-client.h (which diff --git a/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc b/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc index 403e3f8..09de60a 100644 --- a/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc +++ b/chrome/browser/sync/notifier/chrome_invalidation_client_unittest.cc @@ -7,13 +7,13 @@ #include "base/message_loop.h" #include "chrome/browser/sync/notifier/chrome_invalidation_client.h" #include "chrome/browser/sync/notifier/state_writer.h" -#include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/browser/sync/syncable/model_type_payload_map.h" -#include "chrome/browser/sync/util/weak_handle.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" #include "google/cacheinvalidation/v2/types.pb.h" #include "jingle/notifier/base/fake_base_task.h" +#include "sync/syncable/model_type.h" +#include "sync/syncable/model_type_payload_map.h" +#include "sync/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/invalidation_notifier.cc b/chrome/browser/sync/notifier/invalidation_notifier.cc index be7acb9..ea2560d 100644 --- a/chrome/browser/sync/notifier/invalidation_notifier.cc +++ b/chrome/browser/sync/notifier/invalidation_notifier.cc @@ -7,13 +7,13 @@ #include "base/logging.h" #include "base/message_loop_proxy.h" #include "chrome/browser/sync/notifier/sync_notifier_observer.h" -#include "chrome/browser/sync/protocol/service_constants.h" -#include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "jingle/notifier/base/const_communicator.h" #include "jingle/notifier/base/notifier_options_util.h" #include "jingle/notifier/communicator/connection_options.h" #include "net/base/host_port_pair.h" #include "net/url_request/url_request_context.h" +#include "sync/protocol/service_constants.h" +#include "sync/syncable/model_type_payload_map.h" #include "talk/xmpp/jid.h" #include "talk/xmpp/xmppclientsettings.h" diff --git a/chrome/browser/sync/notifier/invalidation_notifier.h b/chrome/browser/sync/notifier/invalidation_notifier.h index ff6fe92..ee5e4b1 100644 --- a/chrome/browser/sync/notifier/invalidation_notifier.h +++ b/chrome/browser/sync/notifier/invalidation_notifier.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -24,10 +24,10 @@ #include "chrome/browser/sync/notifier/invalidation_version_tracker.h" #include "chrome/browser/sync/notifier/state_writer.h" #include "chrome/browser/sync/notifier/sync_notifier.h" -#include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/browser/sync/util/weak_handle.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/communicator/login.h" +#include "sync/syncable/model_type.h" +#include "sync/util/weak_handle.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc index 227d455..a8b2be4 100644 --- a/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc +++ b/chrome/browser/sync/notifier/invalidation_notifier_unittest.cc @@ -8,14 +8,14 @@ #include "base/message_loop.h" #include "chrome/browser/sync/notifier/invalidation_version_tracker.h" #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h" -#include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/browser/sync/syncable/model_type_payload_map.h" -#include "chrome/browser/sync/util/weak_handle.h" #include "jingle/notifier/base/fake_base_task.h" #include "jingle/notifier/base/notifier_options.h" #include "net/base/cert_verifier.h" #include "net/base/host_resolver.h" #include "net/url_request/url_request_test_util.h" +#include "sync/syncable/model_type.h" +#include "sync/syncable/model_type_payload_map.h" +#include "sync/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/invalidation_util.h b/chrome/browser/sync/notifier/invalidation_util.h index f1cdca5..7a14586 100644 --- a/chrome/browser/sync/notifier/invalidation_util.h +++ b/chrome/browser/sync/notifier/invalidation_util.h @@ -10,8 +10,8 @@ #include <string> -#include "chrome/browser/sync/syncable/model_type.h" #include "google/cacheinvalidation/deps/callback.h" +#include "sync/syncable/model_type.h" namespace invalidation { diff --git a/chrome/browser/sync/notifier/invalidation_version_tracker.h b/chrome/browser/sync/notifier/invalidation_version_tracker.h index fe7d545..17d89f3 100644 --- a/chrome/browser/sync/notifier/invalidation_version_tracker.h +++ b/chrome/browser/sync/notifier/invalidation_version_tracker.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -11,7 +11,7 @@ #include <map> #include "base/basictypes.h" -#include "chrome/browser/sync/syncable/model_type.h" +#include "sync/syncable/model_type.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h index 7fa736d..c260dc0 100644 --- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h +++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.h @@ -19,8 +19,8 @@ #include "chrome/browser/sync/notifier/invalidation_version_tracker.h" #include "chrome/browser/sync/notifier/sync_notifier.h" #include "chrome/browser/sync/notifier/sync_notifier_observer.h" -#include "chrome/browser/sync/util/weak_handle.h" #include "jingle/notifier/base/notifier_options.h" +#include "sync/util/weak_handle.h" namespace base { class MessageLoopProxy; diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc index 822a01c..b67adf3 100644 --- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc +++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier_unittest.cc @@ -10,11 +10,11 @@ #include "base/threading/thread.h" #include "chrome/browser/sync/notifier/invalidation_version_tracker.h" #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h" -#include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/browser/sync/syncable/model_type_payload_map.h" -#include "chrome/browser/sync/util/weak_handle.h" #include "jingle/notifier/base/fake_base_task.h" #include "net/url_request/url_request_test_util.h" +#include "sync/syncable/model_type.h" +#include "sync/syncable/model_type_payload_map.h" +#include "sync/util/weak_handle.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/p2p_notifier.cc b/chrome/browser/sync/notifier/p2p_notifier.cc index 1cc50ca..a8aecb5 100644 --- a/chrome/browser/sync/notifier/p2p_notifier.cc +++ b/chrome/browser/sync/notifier/p2p_notifier.cc @@ -6,14 +6,14 @@ #include <algorithm> -#include "base/logging.h" -#include "base/message_loop_proxy.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" +#include "base/logging.h" +#include "base/message_loop_proxy.h" #include "base/values.h" #include "chrome/browser/sync/notifier/sync_notifier_observer.h" -#include "chrome/browser/sync/protocol/service_constants.h" -#include "chrome/browser/sync/syncable/model_type_payload_map.h" +#include "sync/protocol/service_constants.h" +#include "sync/syncable/model_type_payload_map.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/p2p_notifier.h b/chrome/browser/sync/notifier/p2p_notifier.h index 6ff0053..b861c99 100644 --- a/chrome/browser/sync/notifier/p2p_notifier.h +++ b/chrome/browser/sync/notifier/p2p_notifier.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -15,8 +15,8 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "chrome/browser/sync/notifier/sync_notifier.h" -#include "chrome/browser/sync/syncable/model_type.h" #include "jingle/notifier/listener/talk_mediator.h" +#include "sync/syncable/model_type.h" namespace base { class MessageLoopProxy; diff --git a/chrome/browser/sync/notifier/p2p_notifier_unittest.cc b/chrome/browser/sync/notifier/p2p_notifier_unittest.cc index a7c8ad0..8045198 100644 --- a/chrome/browser/sync/notifier/p2p_notifier_unittest.cc +++ b/chrome/browser/sync/notifier/p2p_notifier_unittest.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h" -#include "chrome/browser/sync/syncable/model_type.h" +#include "sync/syncable/model_type.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/registration_manager.cc b/chrome/browser/sync/notifier/registration_manager.cc index cd2fc86..90a15d4 100644 --- a/chrome/browser/sync/notifier/registration_manager.cc +++ b/chrome/browser/sync/notifier/registration_manager.cc @@ -10,9 +10,9 @@ #include "base/rand_util.h" #include "chrome/browser/sync/notifier/invalidation_util.h" -#include "chrome/browser/sync/syncable/model_type.h" #include "google/cacheinvalidation/include/invalidation-client.h" #include "google/cacheinvalidation/include/types.h" +#include "sync/syncable/model_type.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/registration_manager.h b/chrome/browser/sync/notifier/registration_manager.h index 796d6c4c..49ebd47 100644 --- a/chrome/browser/sync/notifier/registration_manager.h +++ b/chrome/browser/sync/notifier/registration_manager.h @@ -13,9 +13,10 @@ #include "base/basictypes.h" #include "base/threading/non_thread_safe.h" +#include "base/threading/non_thread_safe.h" #include "base/time.h" #include "base/timer.h" -#include "chrome/browser/sync/syncable/model_type.h" +#include "sync/syncable/model_type.h" // For invalidation::InvalidationListener::RegistrationState. #include "google/cacheinvalidation/include/invalidation-listener.h" diff --git a/chrome/browser/sync/notifier/registration_manager_unittest.cc b/chrome/browser/sync/notifier/registration_manager_unittest.cc index baf5cb4..7f7abd5 100644 --- a/chrome/browser/sync/notifier/registration_manager_unittest.cc +++ b/chrome/browser/sync/notifier/registration_manager_unittest.cc @@ -13,8 +13,8 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/sync/notifier/invalidation_util.h" -#include "chrome/browser/sync/syncable/model_type.h" #include "google/cacheinvalidation/include/invalidation-client.h" +#include "sync/syncable/model_type.h" #include "testing/gtest/include/gtest/gtest.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/sync_notifier.h b/chrome/browser/sync/notifier/sync_notifier.h index a4f535e..8980146 100644 --- a/chrome/browser/sync/notifier/sync_notifier.h +++ b/chrome/browser/sync/notifier/sync_notifier.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -11,7 +11,7 @@ #include <string> -#include "chrome/browser/sync/syncable/model_type.h" +#include "sync/syncable/model_type.h" namespace sync_notifier { class SyncNotifierObserver; diff --git a/chrome/browser/sync/notifier/sync_notifier_factory.h b/chrome/browser/sync/notifier/sync_notifier_factory.h index d763d1a..a99a707 100644 --- a/chrome/browser/sync/notifier/sync_notifier_factory.h +++ b/chrome/browser/sync/notifier/sync_notifier_factory.h @@ -9,8 +9,8 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/sync/notifier/invalidation_version_tracker.h" -#include "chrome/browser/sync/util/weak_handle.h" #include "jingle/notifier/base/notifier_options.h" +#include "sync/util/weak_handle.h" namespace sync_notifier { diff --git a/chrome/browser/sync/notifier/sync_notifier_factory_unittest.cc b/chrome/browser/sync/notifier/sync_notifier_factory_unittest.cc index 516b389..a001c6b 100644 --- a/chrome/browser/sync/notifier/sync_notifier_factory_unittest.cc +++ b/chrome/browser/sync/notifier/sync_notifier_factory_unittest.cc @@ -14,11 +14,11 @@ #include "chrome/browser/sync/notifier/invalidation_version_tracker.h" #include "chrome/browser/sync/notifier/mock_sync_notifier_observer.h" #include "chrome/browser/sync/notifier/sync_notifier.h" -#include "chrome/browser/sync/syncable/model_type.h" -#include "chrome/browser/sync/syncable/model_type_payload_map.h" #include "jingle/notifier/base/notification_method.h" #include "jingle/notifier/base/notifier_options.h" #include "net/url_request/url_request_test_util.h" +#include "sync/syncable/model_type.h" +#include "sync/syncable/model_type_payload_map.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/notifier/sync_notifier_observer.h b/chrome/browser/sync/notifier/sync_notifier_observer.h index 103655c2..627595b 100644 --- a/chrome/browser/sync/notifier/sync_notifier_observer.h +++ b/chrome/browser/sync/notifier/sync_notifier_observer.h @@ -8,7 +8,7 @@ #include <string> -#include "chrome/browser/sync/syncable/model_type_payload_map.h" +#include "sync/syncable/model_type_payload_map.h" namespace sync_notifier { |