diff options
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/engine/syncapi.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread.cc | 17 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_unittest.cc | 13 |
3 files changed, 14 insertions, 17 deletions
diff --git a/chrome/browser/sync/engine/syncapi.cc b/chrome/browser/sync/engine/syncapi.cc index 206125b..24487eb 100644 --- a/chrome/browser/sync/engine/syncapi.cc +++ b/chrome/browser/sync/engine/syncapi.cc @@ -46,7 +46,6 @@ #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/util/crypto_helpers.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/deprecated/event_sys.h" #include "chrome/common/net/gaia/gaia_authenticator.h" #include "jingle/notifier/listener/mediator_thread_impl.h" diff --git a/chrome/browser/sync/engine/syncer_thread.cc b/chrome/browser/sync/engine/syncer_thread.cc index 3c0cd06..3c95ea7 100644 --- a/chrome/browser/sync/engine/syncer_thread.cc +++ b/chrome/browser/sync/engine/syncer_thread.cc @@ -1,15 +1,8 @@ // Copyright (c) 2010 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. -#include "chrome/browser/sync/engine/syncer_thread.h" - -#include "build/build_config.h" -#if defined(OS_MACOSX) -#include <CoreFoundation/CFNumber.h> -#include <IOKit/IOTypes.h> -#include <IOKit/IOKitLib.h> -#endif +#include "chrome/browser/sync/engine/syncer_thread.h" #include <algorithm> #include <map> @@ -17,13 +10,19 @@ #include "base/rand_util.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" +#include "build/build_config.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/engine/net/server_connection_manager.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/sessions/sync_session.h" -#include "chrome/common/chrome_switches.h" #include "jingle/notifier/listener/notification_constants.h" +#if defined(OS_MACOSX) +#include <CoreFoundation/CFNumber.h> +#include <IOKit/IOTypes.h> +#include <IOKit/IOKitLib.h> +#endif + using std::priority_queue; using std::min; using base::Time; diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index 74cfc24..236c7a5 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -31,7 +31,6 @@ #include "chrome/browser/sync/profile_sync_factory_mock.h" #include "chrome/browser/sync/test_profile_sync_service.h" #include "chrome/browser/sync/profile_sync_test_util.h" -#include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" @@ -647,11 +646,11 @@ TEST_F(ProfileSyncServiceTest, ServerChangeRequiringFosterParent) { int64 f0 = other_bookmarks_id(); // + other_node int64 f1 = adds.AddFolder(L"f1", f0, 0); // + f1 int64 f2 = adds.AddFolder(L"f2", f1, 0); // + f2 - int64 u3 = adds.AddURL( L"u3", url, f2, 0); // + u3 - int64 u4 = adds.AddURL( L"u4", url, f2, u3); // + u4 - int64 u5 = adds.AddURL( L"u5", url, f1, f2); // + u5 + int64 u3 = adds.AddURL( L"u3", url, f2, 0); // + u3 NOLINT + int64 u4 = adds.AddURL( L"u4", url, f2, u3); // + u4 NOLINT + int64 u5 = adds.AddURL( L"u5", url, f1, f2); // + u5 NOLINT int64 f6 = adds.AddFolder(L"f6", f1, u5); // + f6 - int64 u7 = adds.AddURL( L"u7", url, f0, f1); // + u7 + int64 u7 = adds.AddURL( L"u7", url, f0, f1); // + u7 NOLINT vector<sync_api::SyncManager::ChangeRecord>::const_iterator it; // The bookmark model shouldn't yet have seen any of the nodes of |adds|. @@ -1385,8 +1384,8 @@ TEST_F(ProfileSyncServiceTestWithData, TestStartupWithOldSyncData) { profile_.get(), service_.get())); - service_->Initialize(); // will call disableForUser because sync setup - // hasn't been completed. + service_->Initialize(); // will call disableForUser because sync setup + // hasn't been completed. } ASSERT_FALSE(service_->backend()); |