diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 20:37:02 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 20:38:58 +0000 |
commit | 6b7b926890a03b3b51336ca2434e9efe15554c97 (patch) | |
tree | ec279d34deef42f6e029fca7147f28d38738ece0 /components/bookmarks | |
parent | 986b9b9a073eb455a8b016150e10f4850a5ef0bb (diff) | |
download | chromium_src-6b7b926890a03b3b51336ca2434e9efe15554c97.zip chromium_src-6b7b926890a03b3b51336ca2434e9efe15554c97.tar.gz chromium_src-6b7b926890a03b3b51336ca2434e9efe15554c97.tar.bz2 |
Revert of Omnibox: Make URLs of Bookmarks Searchable (patchset #2 of https://codereview.chromium.org/489373005/)
Reason for revert:
Broke interactive_ui_tests on mac: https://build.chromium.org/p/chromium.mac/builders/Mac%2010.6%20Tests%20(dbg)(1)/builds/52199
Original issue's description:
> Omnibox: Make URLs of Bookmarks Searchable
>
> This used to be controlled by a field trial created in
> https://codereview.chromium.org/184663002
>
> After evaluating this change, we've decided to launch it.
> This change turns the flag on by default and removes the field trial code.
> It also removes the index_urls_ parameters everywhere because those will
> always be true forevermore.
>
> I tested this interactively.
> Also, all the unit tests still apparently pass. And yes some of these do
> exercise this feature.
>
> TBR=joaodasilva
> (for trivial change to components/policy/core/browser/managed_bookmarks_tracker_unittest.cc )
>
> BUG=157204,378854
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291445
TBR=pkasting@google.com,sky@chromium.org,pkasting@chromium.org,mpearson@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=157204,378854
Review URL: https://codereview.chromium.org/485483003
Cr-Commit-Position: refs/heads/master@{#291496}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/bookmarks')
12 files changed, 85 insertions, 61 deletions
diff --git a/components/bookmarks/browser/bookmark_codec_unittest.cc b/components/bookmarks/browser/bookmark_codec_unittest.cc index 2947e8bd..7e321b6 100644 --- a/components/bookmarks/browser/bookmark_codec_unittest.cc +++ b/components/bookmarks/browser/bookmark_codec_unittest.cc @@ -85,20 +85,20 @@ class BookmarkCodecTest : public testing::Test { protected: // Helpers to create bookmark models with different data. BookmarkModel* CreateTestModel1() { - scoped_ptr<BookmarkModel> model(client_.CreateModel()); + scoped_ptr<BookmarkModel> model(client_.CreateModel(false)); const BookmarkNode* bookmark_bar = model->bookmark_bar_node(); model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url)); return model.release(); } BookmarkModel* CreateTestModel2() { - scoped_ptr<BookmarkModel> model(client_.CreateModel()); + scoped_ptr<BookmarkModel> model(client_.CreateModel(false)); const BookmarkNode* bookmark_bar = model->bookmark_bar_node(); model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url)); model->AddURL(bookmark_bar, 1, ASCIIToUTF16(kUrl2Title), GURL(kUrl2Url)); return model.release(); } BookmarkModel* CreateTestModel3() { - scoped_ptr<BookmarkModel> model(client_.CreateModel()); + scoped_ptr<BookmarkModel> model(client_.CreateModel(false)); const BookmarkNode* bookmark_bar = model->bookmark_bar_node(); model->AddURL(bookmark_bar, 0, ASCIIToUTF16(kUrl1Title), GURL(kUrl1Url)); const BookmarkNode* folder1 = @@ -185,7 +185,7 @@ class BookmarkCodecTest : public testing::Test { EXPECT_EQ("", decoder.computed_checksum()); EXPECT_EQ("", decoder.stored_checksum()); - scoped_ptr<BookmarkModel> model(client_.CreateModel()); + scoped_ptr<BookmarkModel> model(client_.CreateModel(false)); EXPECT_TRUE(Decode(&decoder, model.get(), value)); *computed_checksum = decoder.computed_checksum(); @@ -325,7 +325,7 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) { BookmarkCodec encoder; scoped_ptr<base::Value> model_value(encoder.Encode(model_to_encode.get())); - scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel()); + scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel(false)); BookmarkCodec decoder; ASSERT_TRUE(Decode(&decoder, decoded_model.get(), *model_value.get())); ASSERT_NO_FATAL_FAILURE( @@ -346,7 +346,7 @@ TEST_F(BookmarkCodecTest, PersistIDsTest) { BookmarkCodec encoder2; scoped_ptr<base::Value> model_value2(encoder2.Encode(decoded_model.get())); - scoped_ptr<BookmarkModel> decoded_model2(client_.CreateModel()); + scoped_ptr<BookmarkModel> decoded_model2(client_.CreateModel(false)); BookmarkCodec decoder2; ASSERT_TRUE(Decode(&decoder2, decoded_model2.get(), *model_value2.get())); ASSERT_NO_FATAL_FAILURE( @@ -362,7 +362,7 @@ TEST_F(BookmarkCodecTest, CanDecodeModelWithoutMobileBookmarks) { JSONFileValueSerializer serializer(test_file); scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL)); - scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel()); + scoped_ptr<BookmarkModel> decoded_model(client_.CreateModel(false)); BookmarkCodec decoder; ASSERT_TRUE(Decode(&decoder, decoded_model.get(), *root.get())); ExpectIDsUnique(decoded_model.get()); @@ -449,7 +449,7 @@ TEST_F(BookmarkCodecTest, CanDecodeMetaInfoAsString) { JSONFileValueSerializer serializer(test_file); scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL)); - scoped_ptr<BookmarkModel> model(client_.CreateModel()); + scoped_ptr<BookmarkModel> model(client_.CreateModel(false)); BookmarkCodec decoder; ASSERT_TRUE(Decode(&decoder, model.get(), *root.get())); diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc index 215eaf7..e33d4d3 100644 --- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc +++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc @@ -57,7 +57,7 @@ BookmarkExpandedStateTrackerTest::~BookmarkExpandedStateTrackerTest() {} void BookmarkExpandedStateTrackerTest::SetUp() { prefs_ = PrefServiceForTesting(); - model_.reset(new BookmarkModel(&client_)); + model_.reset(new BookmarkModel(&client_, false)); model_->Load(prefs_.get(), std::string(), base::FilePath(), diff --git a/components/bookmarks/browser/bookmark_index.cc b/components/bookmarks/browser/bookmark_index.cc index 0d549e3..e52b4ec 100644 --- a/components/bookmarks/browser/bookmark_index.cc +++ b/components/bookmarks/browser/bookmark_index.cc @@ -97,9 +97,11 @@ BookmarkIndex::NodeSet::const_iterator BookmarkIndex::Match::nodes_end() const { } BookmarkIndex::BookmarkIndex(BookmarkClient* client, + bool index_urls, const std::string& languages) : client_(client), - languages_(languages) { + languages_(languages), + index_urls_(index_urls) { DCHECK(client_); } @@ -113,10 +115,12 @@ void BookmarkIndex::Add(const BookmarkNode* node) { ExtractQueryWords(Normalize(node->GetTitle())); for (size_t i = 0; i < terms.size(); ++i) RegisterNode(terms[i], node); - terms = - ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL)); - for (size_t i = 0; i < terms.size(); ++i) - RegisterNode(terms[i], node); + if (index_urls_) { + terms = + ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL)); + for (size_t i = 0; i < terms.size(); ++i) + RegisterNode(terms[i], node); + } } void BookmarkIndex::Remove(const BookmarkNode* node) { @@ -127,10 +131,12 @@ void BookmarkIndex::Remove(const BookmarkNode* node) { ExtractQueryWords(Normalize(node->GetTitle())); for (size_t i = 0; i < terms.size(); ++i) UnregisterNode(terms[i], node); - terms = - ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL)); - for (size_t i = 0; i < terms.size(); ++i) - UnregisterNode(terms[i], node); + if (index_urls_) { + terms = + ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL)); + for (size_t i = 0; i < terms.size(); ++i) + UnregisterNode(terms[i], node); + } } void BookmarkIndex::GetBookmarksMatching(const base::string16& input_query, @@ -212,19 +218,22 @@ void BookmarkIndex::AddMatchToResults( base::i18n::ToLower(Normalize(node->GetTitle())); parser->ExtractQueryWords(lower_title, &title_words); base::OffsetAdjuster::Adjustments adjustments; - parser->ExtractQueryWords( - CleanUpUrlForMatching(node->url(), languages_, &adjustments), - &url_words); + if (index_urls_) { + parser->ExtractQueryWords( + CleanUpUrlForMatching(node->url(), languages_, &adjustments), + &url_words); + } query_parser::Snippet::MatchPositions title_matches, url_matches; for (size_t i = 0; i < query_nodes.size(); ++i) { const bool has_title_matches = query_nodes[i]->HasMatchIn(title_words, &title_matches); - const bool has_url_matches = + const bool has_url_matches = index_urls_ && query_nodes[i]->HasMatchIn(url_words, &url_matches); if (!has_title_matches && !has_url_matches) return; query_parser::QueryParser::SortAndCoalesceMatchPositions(&title_matches); - query_parser::QueryParser::SortAndCoalesceMatchPositions(&url_matches); + if (index_urls_) + query_parser::QueryParser::SortAndCoalesceMatchPositions(&url_matches); } BookmarkMatch match; if (lower_title.length() == node->GetTitle().length()) { @@ -233,15 +242,17 @@ void BookmarkIndex::AddMatchToResults( // TODO(mpearson): revise match positions appropriately. match.title_match_positions.swap(title_matches); } - // Now that we're done processing this entry, correct the offsets of the - // matches in |url_matches| so they point to offsets in the original URL - // spec, not the cleaned-up URL string that we used for matching. - std::vector<size_t> offsets = - BookmarkMatch::OffsetsFromMatchPositions(url_matches); - base::OffsetAdjuster::UnadjustOffsets(adjustments, &offsets); - url_matches = - BookmarkMatch::ReplaceOffsetsInMatchPositions(url_matches, offsets); - match.url_match_positions.swap(url_matches); + if (index_urls_) { + // Now that we're done processing this entry, correct the offsets of the + // matches in |url_matches| so they point to offsets in the original URL + // spec, not the cleaned-up URL string that we used for matching. + std::vector<size_t> offsets = + BookmarkMatch::OffsetsFromMatchPositions(url_matches); + base::OffsetAdjuster::UnadjustOffsets(adjustments, &offsets); + url_matches = + BookmarkMatch::ReplaceOffsetsInMatchPositions(url_matches, offsets); + match.url_match_positions.swap(url_matches); + } match.node = node; results->push_back(match); } diff --git a/components/bookmarks/browser/bookmark_index.h b/components/bookmarks/browser/bookmark_index.h index 6f6fd6e..7087ba3 100644 --- a/components/bookmarks/browser/bookmark_index.h +++ b/components/bookmarks/browser/bookmark_index.h @@ -30,8 +30,11 @@ struct BookmarkMatch; // BookmarkNodes that contain that string in their title or URL. class BookmarkIndex { public: - // |languages| is used to help parse IDNs in URLs for the bookmark index. + // |index_urls| says whether URLs should be stored in the index in addition + // to bookmark titles. |languages| used to help parse IDNs in URLs for the + // bookmark index. BookmarkIndex(BookmarkClient* client, + bool index_urls, const std::string& languages); ~BookmarkIndex(); @@ -111,6 +114,9 @@ class BookmarkIndex { // Languages used to help parse IDNs in URLs for the bookmark index. const std::string languages_; + // True if URLs are stored in the index as well as bookmark titles. + const bool index_urls_; + DISALLOW_COPY_AND_ASSIGN(BookmarkIndex); }; diff --git a/components/bookmarks/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc index 3898e59..e588217 100644 --- a/components/bookmarks/browser/bookmark_index_unittest.cc +++ b/components/bookmarks/browser/bookmark_index_unittest.cc @@ -55,7 +55,7 @@ class BookmarkClientMock : public test::TestBookmarkClient { class BookmarkIndexTest : public testing::Test { public: - BookmarkIndexTest() : model_(client_.CreateModel()) {} + BookmarkIndexTest() : model_(client_.CreateModel(false)) {} typedef std::pair<std::string, std::string> TitleAndURL; @@ -189,7 +189,7 @@ TEST_F(BookmarkIndexTest, GetBookmarksMatching) { ExpectMatches(data[i].query, expected); - model_ = client_.CreateModel(); + model_ = client_.CreateModel(false); } } @@ -238,7 +238,7 @@ TEST_F(BookmarkIndexTest, GetBookmarksMatchingWithURLs) { }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) { - model_ = client_.CreateModel(); + model_ = client_.CreateModel(true); std::vector<TitleAndURL> bookmarks; bookmarks.push_back(TitleAndURL(data[i].title, data[i].url)); AddBookmarks(bookmarks); @@ -275,7 +275,7 @@ TEST_F(BookmarkIndexTest, Normalization) { std::vector<BookmarkMatch> matches; model_->GetBookmarksMatching(UTF8ToUTF16(data[i].query), 10, &matches); EXPECT_EQ(1u, matches.size()); - model_ = client_.CreateModel(); + model_ = client_.CreateModel(false); } } @@ -312,7 +312,7 @@ TEST_F(BookmarkIndexTest, MatchPositionsTitles) { ExpectMatchPositions(matches[0].title_match_positions, expected_title_matches); - model_ = client_.CreateModel(); + model_ = client_.CreateModel(false); } } @@ -348,7 +348,7 @@ TEST_F(BookmarkIndexTest, MatchPositionsURLs) { }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) { - model_ = client_.CreateModel(); + model_ = client_.CreateModel(true); std::vector<TitleAndURL> bookmarks; TitleAndURL bookmark("123456", data[i].url); bookmarks.push_back(bookmark); @@ -430,7 +430,7 @@ TEST_F(BookmarkIndexTest, GetResultsSortedByTypedCount) { typed_count_map.insert(std::make_pair(data[i].url, data[i].typed_count)); BookmarkClientMock client(typed_count_map); - scoped_ptr<BookmarkModel> model = client.CreateModel(); + scoped_ptr<BookmarkModel> model = client.CreateModel(false); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) // Populate the BookmarkIndex. diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc index fa3f5fd..5f26f67 100644 --- a/components/bookmarks/browser/bookmark_model.cc +++ b/components/bookmarks/browser/bookmark_model.cc @@ -96,7 +96,7 @@ class SortComparator : public std::binary_function<const BookmarkNode*, // BookmarkModel -------------------------------------------------------------- -BookmarkModel::BookmarkModel(BookmarkClient* client) +BookmarkModel::BookmarkModel(BookmarkClient* client, bool index_urls) : client_(client), loaded_(false), root_(GURL()), @@ -105,6 +105,7 @@ BookmarkModel::BookmarkModel(BookmarkClient* client) mobile_node_(NULL), next_node_id_(1), observers_(ObserverList<BookmarkModelObserver>::NOTIFY_EXISTING_ONLY), + index_urls_(index_urls), loaded_signal_(true, false), extensive_changes_(0) { DCHECK(client_); @@ -1011,6 +1012,6 @@ scoped_ptr<BookmarkLoadDetails> BookmarkModel::CreateLoadDetails( other_node, mobile_node, client_->GetLoadExtraNodesCallback(), - new BookmarkIndex(client_, accept_languages), + new BookmarkIndex(client_, index_urls_, accept_languages), next_node_id_)); } diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h index b8d9d7e..0a2d964 100644 --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h @@ -66,7 +66,9 @@ class BookmarkModel : public KeyedService { base::string16 title; }; - explicit BookmarkModel(bookmarks::BookmarkClient* client); + // |index_urls| says whether URLs should be stored in the BookmarkIndex + // in addition to bookmark titles. + BookmarkModel(bookmarks::BookmarkClient* client, bool index_urls); virtual ~BookmarkModel(); // KeyedService: @@ -413,6 +415,10 @@ class BookmarkModel : public KeyedService { scoped_ptr<bookmarks::BookmarkIndex> index_; + // True if URLs are stored in the BookmarkIndex in addition to bookmark + // titles. + const bool index_urls_; + base::WaitableEvent loaded_signal_; // See description of IsDoingExtensiveChanges above. diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc index 6dab9f5..fa0787aa 100644 --- a/components/bookmarks/browser/bookmark_model_unittest.cc +++ b/components/bookmarks/browser/bookmark_model_unittest.cc @@ -138,7 +138,7 @@ class BookmarkModelTest : public testing::Test, int index2_; }; - BookmarkModelTest() : model_(client_.CreateModel()) { + BookmarkModelTest() : model_(client_.CreateModel(false)) { model_->AddObserver(this); ClearCounts(); } @@ -282,7 +282,7 @@ class BookmarkModelTest : public testing::Test, client_.SetExtraNodesToLoad(extra_nodes.Pass()); model_->RemoveObserver(this); - model_ = client_.CreateModel(); + model_ = client_.CreateModel(false); model_->AddObserver(this); ClearCounts(); @@ -978,7 +978,7 @@ TEST_F(BookmarkModelTestWithProfile, CreateAndRestore) { { "a b c [ d e [ f ] ]", "g h i [ j k [ l ] ]"}, }; for (size_t i = 0; i < ARRAYSIZE_UNSAFE(data); ++i) { - model_ = client_.CreateModel(); + model_ = client_.CreateModel(false); TestNode bbn; PopulateNodeFromString(data[i].bbn_contents, &bbn); diff --git a/components/bookmarks/browser/bookmark_node_data_unittest.cc b/components/bookmarks/browser/bookmark_node_data_unittest.cc index 731c168..9a0ecd7 100644 --- a/components/bookmarks/browser/bookmark_node_data_unittest.cc +++ b/components/bookmarks/browser/bookmark_node_data_unittest.cc @@ -26,7 +26,7 @@ class BookmarkNodeDataTest : public testing::Test { virtual void SetUp() OVERRIDE { event_source_ = ui::PlatformEventSource::CreateDefault(); - model_ = client_.CreateModel(); + model_ = client_.CreateModel(false); test::WaitForBookmarkModelToLoad(model_.get()); bool success = profile_dir_.CreateUniqueTempDir(); ASSERT_TRUE(success); diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc index 75daeeb..68e084f 100644 --- a/components/bookmarks/browser/bookmark_utils_unittest.cc +++ b/components/bookmarks/browser/bookmark_utils_unittest.cc @@ -75,7 +75,7 @@ class BookmarkUtilsTest : public testing::Test, TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); const BookmarkNode* node1 = model->AddURL(model->other_node(), 0, ASCIIToUTF16("foo bar"), @@ -133,7 +133,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesWordPhraseQuery) { // Check exact matching against a URL query. TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); const BookmarkNode* node1 = model->AddURL(model->other_node(), 0, ASCIIToUTF16("Google"), @@ -169,7 +169,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) { // Check exact matching against a title query. TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); const BookmarkNode* node1 = model->AddURL(model->other_node(), 0, ASCIIToUTF16("Google"), @@ -207,7 +207,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) { // Check matching against a query with multiple predicates. TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); const BookmarkNode* node1 = model->AddURL(model->other_node(), 0, ASCIIToUTF16("Google"), @@ -259,7 +259,7 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) { #if !defined(OS_IOS) TEST_F(BookmarkUtilsTest, CopyPaste) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); const BookmarkNode* node = model->AddURL(model->other_node(), 0, ASCIIToUTF16("foo bar"), @@ -287,7 +287,7 @@ TEST_F(BookmarkUtilsTest, CopyPaste) { TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); const BookmarkNode* node = model->AddURL(model->other_node(), 0, ASCIIToUTF16("foo bar"), @@ -330,7 +330,7 @@ TEST_F(BookmarkUtilsTest, CopyPasteMetaInfo) { #endif TEST_F(BookmarkUtilsTest, MAYBE_CutToClipboard) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); model->AddObserver(this); base::string16 title(ASCIIToUTF16("foo")); @@ -362,7 +362,7 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) { extra_nodes.push_back(extra_node); client.SetExtraNodesToLoad(extra_nodes.Pass()); - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); const BookmarkNode* node = model->AddURL(model->other_node(), 0, ASCIIToUTF16("foo bar"), @@ -385,7 +385,7 @@ TEST_F(BookmarkUtilsTest, PasteNonEditableNodes) { TEST_F(BookmarkUtilsTest, GetParentForNewNodes) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); // This tests the case where selection contains one item and that item is a // folder. std::vector<const BookmarkNode*> nodes; @@ -427,7 +427,7 @@ TEST_F(BookmarkUtilsTest, GetParentForNewNodes) { // Verifies that meta info is copied when nodes are cloned. TEST_F(BookmarkUtilsTest, CloneMetaInfo) { test::TestBookmarkClient client; - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); // Add a node containing meta info. const BookmarkNode* node = model->AddURL(model->other_node(), 0, @@ -465,7 +465,7 @@ TEST_F(BookmarkUtilsTest, RemoveAllBookmarks) { extra_nodes.push_back(extra_node); client.SetExtraNodesToLoad(extra_nodes.Pass()); - scoped_ptr<BookmarkModel> model(client.CreateModel()); + scoped_ptr<BookmarkModel> model(client.CreateModel(false)); EXPECT_TRUE(model->bookmark_bar_node()->empty()); EXPECT_TRUE(model->other_node()->empty()); EXPECT_TRUE(model->mobile_node()->empty()); diff --git a/components/bookmarks/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc index 67e5f37..dcfd032 100644 --- a/components/bookmarks/test/test_bookmark_client.cc +++ b/components/bookmarks/test/test_bookmark_client.cc @@ -17,8 +17,8 @@ TestBookmarkClient::TestBookmarkClient() {} TestBookmarkClient::~TestBookmarkClient() {} -scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel() { - scoped_ptr<BookmarkModel> bookmark_model(new BookmarkModel(this)); +scoped_ptr<BookmarkModel> TestBookmarkClient::CreateModel(bool index_urls) { + scoped_ptr<BookmarkModel> bookmark_model(new BookmarkModel(this, index_urls)); scoped_ptr<bookmarks::BookmarkLoadDetails> details = bookmark_model->CreateLoadDetails(std::string()); details->LoadExtraNodes(); diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h index 7157b1b..bdaf86e 100644 --- a/components/bookmarks/test/test_bookmark_client.h +++ b/components/bookmarks/test/test_bookmark_client.h @@ -19,7 +19,7 @@ class TestBookmarkClient : public bookmarks::BookmarkClient { // Create a BookmarkModel using this object as its client. The returned // BookmarkModel* is owned by the caller. - scoped_ptr<BookmarkModel> CreateModel(); + scoped_ptr<BookmarkModel> CreateModel(bool index_urls); // Sets the list of extra nodes to be returned by the next call to // CreateModel() or GetLoadExtraNodesCallback(). |