| 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.h" | 10 #include "chrome/browser/bookmarks/bookmark_model.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 model_(NULL) { | 37 model_(NULL) { |
| 38 } | 38 } |
| 39 | 39 |
| 40 TestingProfile* profile() const { return profile_.get(); } | 40 TestingProfile* profile() const { return profile_.get(); } |
| 41 PartnerBookmarksShim* partner_bookmarks_shim() const { | 41 PartnerBookmarksShim* partner_bookmarks_shim() const { |
| 42 return PartnerBookmarksShim::BuildForBrowserContext(profile_.get()); | 42 return PartnerBookmarksShim::BuildForBrowserContext(profile_.get()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 const BookmarkNode* AddBookmark(const BookmarkNode* parent, | 45 const BookmarkNode* AddBookmark(const BookmarkNode* parent, |
| 46 const GURL& url, | 46 const GURL& url, |
| 47 const string16& title) { | 47 const base::string16& title) { |
| 48 if (!parent) | 48 if (!parent) |
| 49 parent = model_->bookmark_bar_node(); | 49 parent = model_->bookmark_bar_node(); |
| 50 return model_->AddURL(parent, parent->child_count(), title, url); | 50 return model_->AddURL(parent, parent->child_count(), title, url); |
| 51 } | 51 } |
| 52 | 52 |
| 53 const BookmarkNode* AddFolder(const BookmarkNode* parent, | 53 const BookmarkNode* AddFolder(const BookmarkNode* parent, |
| 54 const 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); |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0); | 364 EXPECT_CALL(observer_, PartnerShimChanged(shim)).Times(0); |
| 365 ASSERT_TRUE(shim->IsLoaded()); | 365 ASSERT_TRUE(shim->IsLoaded()); |
| 366 | 366 |
| 367 const BookmarkNode* partner_bookmark1 = shim->GetNodeByID(3); | 367 const BookmarkNode* partner_bookmark1 = shim->GetNodeByID(3); |
| 368 const BookmarkNode* partner_bookmark2 = shim->GetNodeByID(5); | 368 const BookmarkNode* partner_bookmark2 = shim->GetNodeByID(5); |
| 369 | 369 |
| 370 EXPECT_EQ(ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); | 370 EXPECT_EQ(ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); |
| 371 EXPECT_FALSE(shim->IsReachable(partner_bookmark2)); | 371 EXPECT_FALSE(shim->IsReachable(partner_bookmark2)); |
| 372 } | 372 } |
| 373 } | 373 } |
| OLD | NEW |