Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

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

Issue 291643002: Move favicon callbacks to favicon_base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
OLDNEW
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.h"
17 #include "chrome/browser/favicon/favicon_service_factory.h" 18 #include "chrome/browser/favicon/favicon_service_factory.h"
18 #include "chrome/browser/favicon/favicon_util.h" 19 #include "chrome/browser/favicon/favicon_util.h"
19 #include "chrome/browser/history/history_db_task.h" 20 #include "chrome/browser/history/history_db_task.h"
20 #include "chrome/browser/history/history_service_factory.h" 21 #include "chrome/browser/history/history_service_factory.h"
21 #include "chrome/browser/history/history_types.h" 22 #include "chrome/browser/history/history_types.h"
22 #include "chrome/browser/profiles/profile.h" 23 #include "chrome/browser/profiles/profile.h"
23 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 24 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
24 #include "chrome/browser/sync/test/integration/multi_client_status_change_checke r.h" 25 #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" 26 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
26 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" 27 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 815
815 std::wstring IndexedSubfolderName(int i) { 816 std::wstring IndexedSubfolderName(int i) {
816 return base::StringPrintf(L"Subfolder Name %d", i); 817 return base::StringPrintf(L"Subfolder Name %d", i);
817 } 818 }
818 819
819 std::wstring IndexedSubsubfolderName(int i) { 820 std::wstring IndexedSubsubfolderName(int i) {
820 return base::StringPrintf(L"Subsubfolder Name %d", i); 821 return base::StringPrintf(L"Subsubfolder Name %d", i);
821 } 822 }
822 823
823 } // namespace bookmarks_helper 824 } // namespace bookmarks_helper
OLDNEW
« no previous file with comments | « chrome/browser/history/history_service.cc ('k') | chrome/browser/ui/webui/chrome_web_ui_controller_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698