| 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> |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 DCHECK(task_runner.get()); | 117 DCHECK(task_runner.get()); |
| 118 task_runner_ = task_runner; | 118 task_runner_ = task_runner; |
| 119 } | 119 } |
| 120 | 120 |
| 121 void set_backend(scoped_refptr<history::HistoryBackend> backend) { | 121 void set_backend(scoped_refptr<history::HistoryBackend> backend) { |
| 122 backend_ = backend; | 122 backend_ = backend; |
| 123 } | 123 } |
| 124 | 124 |
| 125 private: | 125 private: |
| 126 void RunTaskOnDBThread(history::HistoryDBTask* task) { | 126 void RunTaskOnDBThread(history::HistoryDBTask* task) { |
| 127 EXPECT_TRUE(task->RunOnDBThread(backend_.get(), NULL)); | 127 EXPECT_TRUE(task->RunOnDBThread(backend_.get(), nullptr)); |
| 128 } | 128 } |
| 129 | 129 |
| 130 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 130 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| 131 scoped_refptr<history::HistoryBackend> backend_; | 131 scoped_refptr<history::HistoryBackend> backend_; |
| 132 }; | 132 }; |
| 133 | 133 |
| 134 class TestTypedUrlSyncableService : public TypedUrlSyncableService { | 134 class TestTypedUrlSyncableService : public TypedUrlSyncableService { |
| 135 // TODO(gangwu): remove TestProfileSyncService or even remove whole test | 135 // TODO(gangwu): remove TestProfileSyncService or even remove whole test |
| 136 // suite, and make sure typed_url_syncable_service_unittest.cc and the various | 136 // suite, and make sure typed_url_syncable_service_unittest.cc and the various |
| 137 // typed url integration tests. | 137 // typed url integration tests. |
| (...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1046 SendNotificationURLsModified(changed_urls); | 1046 SendNotificationURLsModified(changed_urls); |
| 1047 | 1047 |
| 1048 history::URLRows new_sync_entries; | 1048 history::URLRows new_sync_entries; |
| 1049 GetTypedUrlsFromSyncDB(&new_sync_entries); | 1049 GetTypedUrlsFromSyncDB(&new_sync_entries); |
| 1050 | 1050 |
| 1051 // The change should be ignored. | 1051 // The change should be ignored. |
| 1052 ASSERT_EQ(0U, new_sync_entries.size()); | 1052 ASSERT_EQ(0U, new_sync_entries.size()); |
| 1053 } | 1053 } |
| 1054 | 1054 |
| 1055 } // namespace browser_sync | 1055 } // namespace browser_sync |
| OLD | NEW |