| 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 "chrome/browser/sync/test/integration/bookmarks_helper.h" | 5 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "base/rand_util.h" | 11 #include "base/rand_util.h" |
| 12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/strings/string_util.h" | 13 #include "base/strings/string_util.h" |
| 14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 15 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
| 16 #include "base/synchronization/waitable_event.h" | 16 #include "base/synchronization/waitable_event.h" |
| 17 #include "base/task/cancelable_task_tracker.h" | 17 #include "base/task/cancelable_task_tracker.h" |
| 18 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 18 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 19 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" | 19 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" |
| 20 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" | 20 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h" |
| 21 #include "chrome/browser/favicon/favicon_service.h" | 21 #include "chrome/browser/favicon/favicon_service.h" |
| 22 #include "chrome/browser/favicon/favicon_service_factory.h" | 22 #include "chrome/browser/favicon/favicon_service_factory.h" |
| 23 #include "chrome/browser/history/history_db_task.h" | 23 #include "chrome/browser/history/history_db_task.h" |
| 24 #include "chrome/browser/history/history_service.h" |
| 24 #include "chrome/browser/history/history_service_factory.h" | 25 #include "chrome/browser/history/history_service_factory.h" |
| 25 #include "chrome/browser/profiles/profile.h" | 26 #include "chrome/browser/profiles/profile.h" |
| 26 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 27 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
| 27 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke
r.h" | 28 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke
r.h" |
| 28 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 29 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
| 29 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 30 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
| 30 #include "chrome/browser/sync/test/integration/sync_test.h" | 31 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 31 #include "chrome/common/chrome_paths.h" | 32 #include "chrome/common/chrome_paths.h" |
| 32 #include "chrome/test/base/ui_test_utils.h" | |
| 33 #include "components/bookmarks/browser/bookmark_client.h" | 33 #include "components/bookmarks/browser/bookmark_client.h" |
| 34 #include "components/bookmarks/browser/bookmark_model.h" | 34 #include "components/bookmarks/browser/bookmark_model.h" |
| 35 #include "components/bookmarks/browser/bookmark_model_observer.h" | 35 #include "components/bookmarks/browser/bookmark_model_observer.h" |
| 36 #include "components/bookmarks/browser/bookmark_utils.h" | 36 #include "components/bookmarks/browser/bookmark_utils.h" |
| 37 #include "components/favicon_base/favicon_util.h" | 37 #include "components/favicon_base/favicon_util.h" |
| 38 #include "components/history/core/browser/history_types.h" | 38 #include "components/history/core/browser/history_types.h" |
| 39 #include "content/public/test/test_utils.h" |
| 39 #include "testing/gtest/include/gtest/gtest.h" | 40 #include "testing/gtest/include/gtest/gtest.h" |
| 40 #include "third_party/skia/include/core/SkBitmap.h" | 41 #include "third_party/skia/include/core/SkBitmap.h" |
| 41 #include "ui/base/models/tree_node_iterator.h" | 42 #include "ui/base/models/tree_node_iterator.h" |
| 42 #include "ui/gfx/image/image_skia.h" | 43 #include "ui/gfx/image/image_skia.h" |
| 43 | 44 |
| 44 namespace { | 45 namespace { |
| 45 | 46 |
| 46 // History task which runs all pending tasks on the history thread and | 47 // History task which runs all pending tasks on the history thread and |
| 47 // signals when the tasks have completed. | 48 // signals when the tasks have completed. |
| 48 class HistoryEmptyTask : public history::HistoryDBTask { | 49 class HistoryEmptyTask : public history::HistoryDBTask { |
| (...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 829 | 830 |
| 830 std::string IndexedSubfolderName(int i) { | 831 std::string IndexedSubfolderName(int i) { |
| 831 return base::StringPrintf("Subfolder Name %d", i); | 832 return base::StringPrintf("Subfolder Name %d", i); |
| 832 } | 833 } |
| 833 | 834 |
| 834 std::string IndexedSubsubfolderName(int i) { | 835 std::string IndexedSubsubfolderName(int i) { |
| 835 return base::StringPrintf("Subsubfolder Name %d", i); | 836 return base::StringPrintf("Subsubfolder Name %d", i); |
| 836 } | 837 } |
| 837 | 838 |
| 838 } // namespace bookmarks_helper | 839 } // namespace bookmarks_helper |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 687903003:
Cleanup: Remove unneeded ui_test_utils.h includes. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master