| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/bookmarks/browser/bookmark_utils.h" | 5 #include "components/bookmarks/browser/bookmark_utils.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 // The undo framework is not used under Android. Thus the group change | 47 // The undo framework is not used under Android. Thus the group change |
| 48 // events will not be fired and so should not be tested for Android. | 48 // events will not be fired and so should not be tested for Android. |
| 49 #if !defined(OS_ANDROID) | 49 #if !defined(OS_ANDROID) |
| 50 EXPECT_EQ(grouped_changes_beginning_count_, expected_beginning_count); | 50 EXPECT_EQ(grouped_changes_beginning_count_, expected_beginning_count); |
| 51 EXPECT_EQ(grouped_changes_ended_count_, expected_ended_count); | 51 EXPECT_EQ(grouped_changes_ended_count_, expected_ended_count); |
| 52 #endif | 52 #endif |
| 53 } | 53 } |
| 54 | 54 |
| 55 private: | 55 private: |
| 56 // BaseBookmarkModelObserver: | 56 // BaseBookmarkModelObserver: |
| 57 virtual void BookmarkModelChanged() override {} | 57 void BookmarkModelChanged() override {} |
| 58 | 58 |
| 59 virtual void GroupedBookmarkChangesBeginning(BookmarkModel* model) override { | 59 void GroupedBookmarkChangesBeginning(BookmarkModel* model) override { |
| 60 ++grouped_changes_beginning_count_; | 60 ++grouped_changes_beginning_count_; |
| 61 } | 61 } |
| 62 | 62 |
| 63 virtual void GroupedBookmarkChangesEnded(BookmarkModel* model) override { | 63 void GroupedBookmarkChangesEnded(BookmarkModel* model) override { |
| 64 ++grouped_changes_ended_count_; | 64 ++grouped_changes_ended_count_; |
| 65 } | 65 } |
| 66 | 66 |
| 67 int grouped_changes_beginning_count_; | 67 int grouped_changes_beginning_count_; |
| 68 int grouped_changes_ended_count_; | 68 int grouped_changes_ended_count_; |
| 69 | 69 |
| 70 // Clipboard requires a message loop. | 70 // Clipboard requires a message loop. |
| 71 base::MessageLoopForUI loop_; | 71 base::MessageLoopForUI loop_; |
| 72 | 72 |
| 73 DISALLOW_COPY_AND_ASSIGN(BookmarkUtilsTest); | 73 DISALLOW_COPY_AND_ASSIGN(BookmarkUtilsTest); |
| (...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 model->GetNodesByURL(url, &nodes); | 553 model->GetNodesByURL(url, &nodes); |
| 554 ASSERT_EQ(1u, nodes.size()); | 554 ASSERT_EQ(1u, nodes.size()); |
| 555 EXPECT_TRUE(model->bookmark_bar_node()->empty()); | 555 EXPECT_TRUE(model->bookmark_bar_node()->empty()); |
| 556 EXPECT_TRUE(model->other_node()->empty()); | 556 EXPECT_TRUE(model->other_node()->empty()); |
| 557 EXPECT_TRUE(model->mobile_node()->empty()); | 557 EXPECT_TRUE(model->mobile_node()->empty()); |
| 558 EXPECT_EQ(1, extra_node->child_count()); | 558 EXPECT_EQ(1, extra_node->child_count()); |
| 559 } | 559 } |
| 560 | 560 |
| 561 } // namespace | 561 } // namespace |
| 562 } // namespace bookmarks | 562 } // namespace bookmarks |
| OLD | NEW |