Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1239)

Side by Side Diff: chrome/browser/bookmarks/bookmark_index_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/string_split.h" 10 #include "base/string_split.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/utf_string_conversions.h" 12 #include "base/utf_string_conversions.h"
13 #include "chrome/browser/bookmarks/bookmark_index.h" 13 #include "chrome/browser/bookmarks/bookmark_index.h"
14 #include "chrome/browser/bookmarks/bookmark_model.h" 14 #include "chrome/browser/bookmarks/bookmark_model.h"
15 #include "chrome/browser/bookmarks/bookmark_utils.h" 15 #include "chrome/browser/bookmarks/bookmark_utils.h"
16 #include "chrome/browser/history/history_database.h" 16 #include "chrome/browser/history/history_database.h"
17 #include "chrome/browser/history/in_memory_database.h" 17 #include "chrome/browser/history/in_memory_database.h"
18 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
19 #include "content/test/test_browser_thread.h" 19 #include "content/public/test/test_browser_thread.h"
20 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
21 21
22 using content::BrowserThread; 22 using content::BrowserThread;
23 23
24 class BookmarkIndexTest : public testing::Test { 24 class BookmarkIndexTest : public testing::Test {
25 public: 25 public:
26 BookmarkIndexTest() : model_(new BookmarkModel(NULL)) {} 26 BookmarkIndexTest() : model_(new BookmarkModel(NULL)) {}
27 27
28 void AddBookmarksWithTitles(const char** titles, size_t count) { 28 void AddBookmarksWithTitles(const char** titles, size_t count) {
29 std::vector<std::string> title_vector; 29 std::vector<std::string> title_vector;
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 EXPECT_EQ(data[1].url, matches[3].node->url()); 294 EXPECT_EQ(data[1].url, matches[3].node->url());
295 295
296 matches.clear(); 296 matches.clear();
297 // Select top two matches. 297 // Select top two matches.
298 model->GetBookmarksWithTitlesMatching(ASCIIToUTF16("google"), 2, &matches); 298 model->GetBookmarksWithTitlesMatching(ASCIIToUTF16("google"), 2, &matches);
299 299
300 EXPECT_EQ(2, static_cast<int>(matches.size())); 300 EXPECT_EQ(2, static_cast<int>(matches.size()));
301 EXPECT_EQ(data[0].url, matches[0].node->url()); 301 EXPECT_EQ(data[0].url, matches[0].node->url());
302 EXPECT_EQ(data[3].url, matches[1].node->url()); 302 EXPECT_EQ(data[3].url, matches[1].node->url());
303 } 303 }
OLDNEW
« no previous file with comments | « chrome/browser/bookmarks/bookmark_html_writer_unittest.cc ('k') | chrome/browser/bookmarks/bookmark_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698