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

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

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 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 <set>
8 #include <vector>
9
7 #include "base/bind.h" 10 #include "base/bind.h"
8 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
9 #include "base/files/file_util.h" 12 #include "base/files/file_util.h"
10 #include "base/path_service.h" 13 #include "base/path_service.h"
11 #include "base/rand_util.h" 14 #include "base/rand_util.h"
12 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
14 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
15 #include "base/strings/utf_string_conversions.h" 18 #include "base/strings/utf_string_conversions.h"
16 #include "base/synchronization/waitable_event.h" 19 #include "base/synchronization/waitable_event.h"
(...skipping 19 matching lines...) Expand all
36 #include "components/favicon_base/favicon_util.h" 39 #include "components/favicon_base/favicon_util.h"
37 #include "components/history/core/browser/history_db_task.h" 40 #include "components/history/core/browser/history_db_task.h"
38 #include "components/history/core/browser/history_types.h" 41 #include "components/history/core/browser/history_types.h"
39 #include "content/public/test/test_utils.h" 42 #include "content/public/test/test_utils.h"
40 #include "testing/gtest/include/gtest/gtest.h" 43 #include "testing/gtest/include/gtest/gtest.h"
41 #include "third_party/skia/include/core/SkBitmap.h" 44 #include "third_party/skia/include/core/SkBitmap.h"
42 #include "ui/base/models/tree_node_iterator.h" 45 #include "ui/base/models/tree_node_iterator.h"
43 #include "ui/gfx/image/image_skia.h" 46 #include "ui/gfx/image/image_skia.h"
44 47
45 using bookmarks::BookmarkModel; 48 using bookmarks::BookmarkModel;
49 using bookmarks::BookmarkNode;
46 50
47 namespace { 51 namespace {
48 52
49 // History task which runs all pending tasks on the history thread and 53 // History task which runs all pending tasks on the history thread and
50 // signals when the tasks have completed. 54 // signals when the tasks have completed.
51 class HistoryEmptyTask : public history::HistoryDBTask { 55 class HistoryEmptyTask : public history::HistoryDBTask {
52 public: 56 public:
53 explicit HistoryEmptyTask(base::WaitableEvent* done) : done_(done) {} 57 explicit HistoryEmptyTask(base::WaitableEvent* done) : done_(done) {}
54 58
55 bool RunOnDBThread(history::HistoryBackend* backend, 59 bool RunOnDBThread(history::HistoryBackend* backend,
(...skipping 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
851 855
852 std::string IndexedSubfolderName(int i) { 856 std::string IndexedSubfolderName(int i) {
853 return base::StringPrintf("Subfolder Name %d", i); 857 return base::StringPrintf("Subfolder Name %d", i);
854 } 858 }
855 859
856 std::string IndexedSubsubfolderName(int i) { 860 std::string IndexedSubsubfolderName(int i) {
857 return base::StringPrintf("Subsubfolder Name %d", i); 861 return base::StringPrintf("Subsubfolder Name %d", i);
858 } 862 }
859 863
860 } // namespace bookmarks_helper 864 } // namespace bookmarks_helper
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698