| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/android/bookmarks/partner_bookmarks_shim.h" | 5 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 | 52 |
| 53 const BookmarkNode* AddFolder(const BookmarkNode* parent, | 53 const BookmarkNode* AddFolder(const BookmarkNode* parent, |
| 54 const base::string16& title) { | 54 const base::string16& title) { |
| 55 if (!parent) | 55 if (!parent) |
| 56 parent = model_->bookmark_bar_node(); | 56 parent = model_->bookmark_bar_node(); |
| 57 return model_->AddFolder(parent, parent->child_count(), title); | 57 return model_->AddFolder(parent, parent->child_count(), title); |
| 58 } | 58 } |
| 59 | 59 |
| 60 protected: | 60 protected: |
| 61 // testing::Test | 61 // testing::Test |
| 62 virtual void SetUp() OVERRIDE { | 62 virtual void SetUp() override { |
| 63 profile_.reset(new TestingProfile()); | 63 profile_.reset(new TestingProfile()); |
| 64 profile_->CreateBookmarkModel(true); | 64 profile_->CreateBookmarkModel(true); |
| 65 | 65 |
| 66 model_ = BookmarkModelFactory::GetForProfile(profile_.get()); | 66 model_ = BookmarkModelFactory::GetForProfile(profile_.get()); |
| 67 test::WaitForBookmarkModelToLoad(model_); | 67 test::WaitForBookmarkModelToLoad(model_); |
| 68 } | 68 } |
| 69 | 69 |
| 70 virtual void TearDown() OVERRIDE { | 70 virtual void TearDown() override { |
| 71 PartnerBookmarksShim::ClearInBrowserContextForTesting(profile_.get()); | 71 PartnerBookmarksShim::ClearInBrowserContextForTesting(profile_.get()); |
| 72 PartnerBookmarksShim::ClearPartnerModelForTesting(); | 72 PartnerBookmarksShim::ClearPartnerModelForTesting(); |
| 73 PartnerBookmarksShim::EnablePartnerBookmarksEditing(); | 73 PartnerBookmarksShim::EnablePartnerBookmarksEditing(); |
| 74 profile_.reset(NULL); | 74 profile_.reset(NULL); |
| 75 } | 75 } |
| 76 | 76 |
| 77 scoped_ptr<TestingProfile> profile_; | 77 scoped_ptr<TestingProfile> profile_; |
| 78 | 78 |
| 79 base::MessageLoopForUI message_loop_; | 79 base::MessageLoopForUI message_loop_; |
| 80 content::TestBrowserThread ui_thread_; | 80 content::TestBrowserThread ui_thread_; |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 403 shim->RenameBookmark(partner_bookmark1, base::ASCIIToUTF16("a2.com")); | 403 shim->RenameBookmark(partner_bookmark1, base::ASCIIToUTF16("a2.com")); |
| 404 shim->RemoveBookmark(partner_bookmark2); | 404 shim->RemoveBookmark(partner_bookmark2); |
| 405 EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); | 405 EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); |
| 406 EXPECT_FALSE(shim->IsReachable(partner_bookmark2)); | 406 EXPECT_FALSE(shim->IsReachable(partner_bookmark2)); |
| 407 | 407 |
| 408 // Disable edits and check that edits are not applied anymore. | 408 // Disable edits and check that edits are not applied anymore. |
| 409 PartnerBookmarksShim::DisablePartnerBookmarksEditing(); | 409 PartnerBookmarksShim::DisablePartnerBookmarksEditing(); |
| 410 EXPECT_EQ(base::ASCIIToUTF16("a"), shim->GetTitle(partner_bookmark1)); | 410 EXPECT_EQ(base::ASCIIToUTF16("a"), shim->GetTitle(partner_bookmark1)); |
| 411 EXPECT_TRUE(shim->IsReachable(partner_bookmark2)); | 411 EXPECT_TRUE(shim->IsReachable(partner_bookmark2)); |
| 412 } | 412 } |
| OLD | NEW |