| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| 11 #include <vector> | 11 #include <vector> |
| 12 | 12 |
| 13 #include "base/bind.h" | 13 #include "base/bind.h" |
| 14 #include "base/bind_helpers.h" | 14 #include "base/bind_helpers.h" |
| 15 #include "base/callback.h" | 15 #include "base/callback.h" |
| 16 #include "base/location.h" | 16 #include "base/location.h" |
| 17 #include "base/macros.h" | 17 #include "base/macros.h" |
| 18 #include "base/memory/ptr_util.h" | 18 #include "base/memory/ptr_util.h" |
| 19 #include "base/memory/ref_counted.h" | 19 #include "base/memory/ref_counted.h" |
| 20 #include "base/message_loop/message_loop.h" |
| 20 #include "base/run_loop.h" | 21 #include "base/run_loop.h" |
| 21 #include "base/strings/string16.h" | 22 #include "base/strings/string16.h" |
| 22 #include "base/strings/utf_string_conversions.h" | 23 #include "base/strings/utf_string_conversions.h" |
| 23 #include "base/threading/thread.h" | 24 #include "base/threading/thread.h" |
| 24 #include "base/threading/thread_task_runner_handle.h" | 25 #include "base/threading/thread_task_runner_handle.h" |
| 25 #include "base/time/time.h" | 26 #include "base/time/time.h" |
| 26 #include "components/browser_sync/abstract_profile_sync_service_test.h" | 27 #include "components/browser_sync/abstract_profile_sync_service_test.h" |
| 27 #include "components/browser_sync/test_profile_sync_service.h" | 28 #include "components/browser_sync/test_profile_sync_service.h" |
| 28 #include "components/history/core/browser/history_backend.h" | 29 #include "components/history/core/browser/history_backend.h" |
| 29 #include "components/history/core/browser/history_backend_client.h" | 30 #include "components/history/core/browser/history_backend_client.h" |
| (...skipping 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1036 SendNotificationURLsModified(changed_urls); | 1037 SendNotificationURLsModified(changed_urls); |
| 1037 | 1038 |
| 1038 history::URLRows new_sync_entries; | 1039 history::URLRows new_sync_entries; |
| 1039 GetTypedUrlsFromSyncDB(&new_sync_entries); | 1040 GetTypedUrlsFromSyncDB(&new_sync_entries); |
| 1040 | 1041 |
| 1041 // The change should be ignored. | 1042 // The change should be ignored. |
| 1042 ASSERT_EQ(0U, new_sync_entries.size()); | 1043 ASSERT_EQ(0U, new_sync_entries.size()); |
| 1043 } | 1044 } |
| 1044 | 1045 |
| 1045 } // namespace browser_sync | 1046 } // namespace browser_sync |
| OLD | NEW |