chrome/browser/sync/test/integration/bookmarks_helper.cc - Issue 284893003: Move bookmarks/core/... to bookmarks/...

Side by Side Diff: chrome/browser/sync/test/integration/bookmarks_helper.cc

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « chrome/browser/sync/test/integration/bookmarks_helper.h ('k') | chrome/browser/sync/test/integration/single_client_bookmarks_sync_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/compiler_specific.h"	7 #include "base/compiler_specific.h"

8 #include "base/file_util.h"	8 #include "base/file_util.h"

9 #include "base/path_service.h"	9 #include "base/path_service.h"

10 #include "base/rand_util.h"	10 #include "base/rand_util.h"

11 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

12 #include "base/strings/string_util.h"	12 #include "base/strings/string_util.h"

13 #include "base/strings/stringprintf.h"	13 #include "base/strings/stringprintf.h"

14 #include "base/strings/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

15 #include "base/synchronization/waitable_event.h"	15 #include "base/synchronization/waitable_event.h"

16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

17 #include "chrome/browser/favicon/favicon_service_factory.h"	17 #include "chrome/browser/favicon/favicon_service_factory.h"

18 #include "chrome/browser/favicon/favicon_util.h"	18 #include "chrome/browser/favicon/favicon_util.h"

19 #include "chrome/browser/history/history_db_task.h"	19 #include "chrome/browser/history/history_db_task.h"

20 #include "chrome/browser/history/history_service_factory.h"	20 #include "chrome/browser/history/history_service_factory.h"

21 #include "chrome/browser/history/history_types.h"	21 #include "chrome/browser/history/history_types.h"

22 #include "chrome/browser/profiles/profile.h"	22 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/sync/glue/bookmark_change_processor.h"	23 #include "chrome/browser/sync/glue/bookmark_change_processor.h"

24 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke r.h"	24 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke r.h"

25 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"	25 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

26 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"	26 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"

27 #include "chrome/browser/sync/test/integration/sync_test.h"	27 #include "chrome/browser/sync/test/integration/sync_test.h"

28 #include "chrome/common/chrome_paths.h"	28 #include "chrome/common/chrome_paths.h"

29 #include "chrome/test/base/ui_test_utils.h"	29 #include "chrome/test/base/ui_test_utils.h"

30 #include "components/bookmarks/core/browser/bookmark_model.h"	30 #include "components/bookmarks/browser/bookmark_model.h"

31 #include "components/bookmarks/core/browser/bookmark_model_observer.h"	31 #include "components/bookmarks/browser/bookmark_model_observer.h"

32 #include "components/bookmarks/core/browser/bookmark_utils.h"	32 #include "components/bookmarks/browser/bookmark_utils.h"

33 #include "testing/gtest/include/gtest/gtest.h"	33 #include "testing/gtest/include/gtest/gtest.h"

34 #include "third_party/skia/include/core/SkBitmap.h"	34 #include "third_party/skia/include/core/SkBitmap.h"

35 #include "ui/base/models/tree_node_iterator.h"	35 #include "ui/base/models/tree_node_iterator.h"

36 #include "ui/gfx/image/image_skia.h"	36 #include "ui/gfx/image/image_skia.h"

37	37

38 namespace {	38 namespace {

39	39

40 // History task which runs all pending tasks on the history thread and	40 // History task which runs all pending tasks on the history thread and

41 // signals when the tasks have completed.	41 // signals when the tasks have completed.

42 class HistoryEmptyTask : public history::HistoryDBTask {	42 class HistoryEmptyTask : public history::HistoryDBTask {

(...skipping 771 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
814	814

815 std::wstring IndexedSubfolderName(int i) {	815 std::wstring IndexedSubfolderName(int i) {

816 return base::StringPrintf(L"Subfolder Name %d", i);	816 return base::StringPrintf(L"Subfolder Name %d", i);

817 }	817 }

818	818

819 std::wstring IndexedSubsubfolderName(int i) {	819 std::wstring IndexedSubsubfolderName(int i) {

820 return base::StringPrintf(L"Subsubfolder Name %d", i);	820 return base::StringPrintf(L"Subsubfolder Name %d", i);

821 }	821 }

822	822

823 } // namespace bookmarks_helper	823 } // namespace bookmarks_helper

OLD	NEW