OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/test/live_sync/bookmarks_helper.h" | 5 #include "chrome/browser/sync/test/live_sync/bookmarks_helper.h" |
6 | 6 |
7 #include "base/rand_util.h" | 7 #include "base/rand_util.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/bookmarks/bookmark_model.h" | 11 #include "chrome/browser/bookmarks/bookmark_model.h" |
12 #include "chrome/browser/bookmarks/bookmark_model_observer.h" | 12 #include "chrome/browser/bookmarks/bookmark_model_observer.h" |
13 #include "chrome/browser/bookmarks/bookmark_utils.h" | 13 #include "chrome/browser/bookmarks/bookmark_utils.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/sync/glue/bookmark_change_processor.h" | 15 #include "chrome/browser/sync/glue/bookmark_change_processor.h" |
16 #include "chrome/browser/sync/profile_sync_service_harness.h" | 16 #include "chrome/browser/sync/profile_sync_service_harness.h" |
| 17 #include "chrome/browser/sync/test/live_sync/live_sync_test.h" |
| 18 #include "chrome/browser/sync/test/live_sync/sync_datatype_helper.h" |
17 #include "chrome/test/base/ui_test_utils.h" | 19 #include "chrome/test/base/ui_test_utils.h" |
18 #include "chrome/test/live_sync/live_sync_test.h" | |
19 #include "chrome/test/live_sync/sync_datatype_helper.h" | |
20 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
21 #include "third_party/skia/include/core/SkBitmap.h" | 21 #include "third_party/skia/include/core/SkBitmap.h" |
22 #include "ui/base/models/tree_node_iterator.h" | 22 #include "ui/base/models/tree_node_iterator.h" |
23 #include "ui/gfx/codec/png_codec.h" | 23 #include "ui/gfx/codec/png_codec.h" |
24 | 24 |
25 using sync_datatype_helper::test; | 25 using sync_datatype_helper::test; |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 // Helper class used to wait for changes to take effect on the favicon of a | 29 // Helper class used to wait for changes to take effect on the favicon of a |
(...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
584 | 584 |
585 std::wstring IndexedSubfolderName(int i) { | 585 std::wstring IndexedSubfolderName(int i) { |
586 return StringPrintf(L"Subfolder Name %d", i); | 586 return StringPrintf(L"Subfolder Name %d", i); |
587 } | 587 } |
588 | 588 |
589 std::wstring IndexedSubsubfolderName(int i) { | 589 std::wstring IndexedSubsubfolderName(int i) { |
590 return StringPrintf(L"Subsubfolder Name %d", i); | 590 return StringPrintf(L"Subsubfolder Name %d", i); |
591 } | 591 } |
592 | 592 |
593 } // namespace bookmarks_helper | 593 } // namespace bookmarks_helper |
OLD | NEW |