| 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 const BookmarkNode* pasted = folder->GetChild(0); | 315 const BookmarkNode* pasted = folder->GetChild(0); |
| 316 ASSERT_TRUE(pasted->GetMetaInfoMap()); | 316 ASSERT_TRUE(pasted->GetMetaInfoMap()); |
| 317 EXPECT_EQ(2u, pasted->GetMetaInfoMap()->size()); | 317 EXPECT_EQ(2u, pasted->GetMetaInfoMap()->size()); |
| 318 std::string value; | 318 std::string value; |
| 319 EXPECT_TRUE(pasted->GetMetaInfo("somekey", &value)); | 319 EXPECT_TRUE(pasted->GetMetaInfo("somekey", &value)); |
| 320 EXPECT_EQ("somevalue", value); | 320 EXPECT_EQ("somevalue", value); |
| 321 EXPECT_TRUE(pasted->GetMetaInfo("someotherkey", &value)); | 321 EXPECT_TRUE(pasted->GetMetaInfo("someotherkey", &value)); |
| 322 EXPECT_EQ("someothervalue", value); | 322 EXPECT_EQ("someothervalue", value); |
| 323 } | 323 } |
| 324 | 324 |
| 325 TEST_F(BookmarkUtilsTest, CutToClipboard) { | 325 #if defined(OS_LINUX) || defined(OS_MACOSX) |
| 326 // http://crbug.com/396472 |
| 327 #define MAYBE_CutToClipboard DISABLED_CutToClipboard |
| 328 #else |
| 329 #define MAYBE_CutToClipboard CutToClipboard |
| 330 #endif |
| 331 TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) { |
| 326 test::TestBookmarkClient client; | 332 test::TestBookmarkClient client; |
| 327 scoped_ptr<BookmarkModel> model(client.CreateModel(false)); | 333 scoped_ptr<BookmarkModel> model(client.CreateModel(false)); |
| 328 model->AddObserver(this); | 334 model->AddObserver(this); |
| 329 | 335 |
| 330 base::string16 title(ASCIIToUTF16("foo")); | 336 base::string16 title(ASCIIToUTF16("foo")); |
| 331 GURL url("http://foo.com"); | 337 GURL url("http://foo.com"); |
| 332 const BookmarkNode* n1 = model->AddURL(model->other_node(), 0, title, url); | 338 const BookmarkNode* n1 = model->AddURL(model->other_node(), 0, title, url); |
| 333 const BookmarkNode* n2 = model->AddURL(model->other_node(), 1, title, url); | 339 const BookmarkNode* n2 = model->AddURL(model->other_node(), 1, title, url); |
| 334 | 340 |
| 335 // Cut the nodes to the clipboard. | 341 // Cut the nodes to the clipboard. |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 model->GetNodesByURL(url, &nodes); | 488 model->GetNodesByURL(url, &nodes); |
| 483 ASSERT_EQ(1u, nodes.size()); | 489 ASSERT_EQ(1u, nodes.size()); |
| 484 EXPECT_TRUE(model->bookmark_bar_node()->empty()); | 490 EXPECT_TRUE(model->bookmark_bar_node()->empty()); |
| 485 EXPECT_TRUE(model->other_node()->empty()); | 491 EXPECT_TRUE(model->other_node()->empty()); |
| 486 EXPECT_TRUE(model->mobile_node()->empty()); | 492 EXPECT_TRUE(model->mobile_node()->empty()); |
| 487 EXPECT_EQ(1, extra_node->child_count()); | 493 EXPECT_EQ(1, extra_node->child_count()); |
| 488 } | 494 } |
| 489 | 495 |
| 490 } // namespace | 496 } // namespace |
| 491 } // namespace bookmarks | 497 } // namespace bookmarks |
| OLD | NEW |