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

Unified Diff: components/bookmarks/test/test_bookmark_client.h

Issue 562693002: Move TestBookmarkClient into bookmarks namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix enhanced_bookmarks Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: components/bookmarks/test/test_bookmark_client.h
diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h
index 7157b1b7b3c50890672ba0496f72b27f798a2057..19b9c79fc39fdd3d95ca9f8758f264c544a4af36 100644
--- a/components/bookmarks/test/test_bookmark_client.h
+++ b/components/bookmarks/test/test_bookmark_client.h
@@ -10,9 +10,9 @@
class BookmarkModel;
-namespace test {
+namespace bookmarks {
-class TestBookmarkClient : public bookmarks::BookmarkClient {
+class TestBookmarkClient : public BookmarkClient {
public:
TestBookmarkClient();
virtual ~TestBookmarkClient();
@@ -23,7 +23,7 @@ class TestBookmarkClient : public bookmarks::BookmarkClient {
// Sets the list of extra nodes to be returned by the next call to
// CreateModel() or GetLoadExtraNodesCallback().
- void SetExtraNodesToLoad(bookmarks::BookmarkPermanentNodeList extra_nodes);
+ void SetExtraNodesToLoad(BookmarkPermanentNodeList extra_nodes);
// Returns the current extra_nodes, set via SetExtraNodesToLoad().
const std::vector<BookmarkPermanentNode*>& extra_nodes() {
@@ -37,27 +37,27 @@ class TestBookmarkClient : public bookmarks::BookmarkClient {
bool IsAnExtraNode(const BookmarkNode* node);
private:
- // bookmarks::BookmarkClient:
+ // BookmarkClient:
virtual bool IsPermanentNodeVisible(
const BookmarkPermanentNode* node) OVERRIDE;
virtual void RecordAction(const base::UserMetricsAction& action) OVERRIDE;
- virtual bookmarks::LoadExtraCallback GetLoadExtraNodesCallback() OVERRIDE;
+ virtual LoadExtraCallback GetLoadExtraNodesCallback() OVERRIDE;
virtual bool CanSetPermanentNodeTitle(
const BookmarkNode* permanent_node) OVERRIDE;
virtual bool CanSyncNode(const BookmarkNode* node) OVERRIDE;
virtual bool CanBeEditedByUser(const BookmarkNode* node) OVERRIDE;
// Helpers for GetLoadExtraNodesCallback().
- static bookmarks::BookmarkPermanentNodeList LoadExtraNodes(
- bookmarks::BookmarkPermanentNodeList extra_nodes,
+ static BookmarkPermanentNodeList LoadExtraNodes(
+ BookmarkPermanentNodeList extra_nodes,
int64* next_id);
- bookmarks::BookmarkPermanentNodeList extra_nodes_to_load_;
+ BookmarkPermanentNodeList extra_nodes_to_load_;
std::vector<BookmarkPermanentNode*> extra_nodes_;
DISALLOW_COPY_AND_ASSIGN(TestBookmarkClient);
};
-} // namespace test
+} // namespace bookmarks
#endif // COMPONENTS_BOOKMARKS_TEST_TEST_BOOKMARK_CLIENT_H_
« no previous file with comments | « components/bookmarks/browser/bookmark_utils_unittest.cc ('k') | components/bookmarks/test/test_bookmark_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698