diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 17:01:37 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 17:01:37 +0000 |
| commit | 489d73e7fca72f29bd6620e268609133aa217795 (patch) | |
| tree | a3ea497ed6b15be2d9742821dd4a2f36a0d885ce /chrome/browser/sessions/session_service_test_helper.cc | |
| parent | 60c413c96834553e182e8c9c34d1e8958f3b0fb5 (diff) | |
| download | chromium_src-489d73e7fca72f29bd6620e268609133aa217795.zip chromium_src-489d73e7fca72f29bd6620e268609133aa217795.tar.gz chromium_src-489d73e7fca72f29bd6620e268609133aa217795.tar.bz2 | |
Run more unit tests on Linux:
- used string16 instead of wstring where needed
- replaced GetTickCount calls with portable functions from base/time.h
- misc GCC cleanups
- enabled following unit tests on Linux:
browser/autocomplete/history_contents_provider_unittest.cc
browser/autocomplete/history_url_provider_unittest.cc
browser/autocomplete/keyword_provider_unittest.cc
browser/bookmarks/bookmark_html_writer_unittest.cc
Review URL: http://codereview.chromium.org/39335
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11249 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/session_service_test_helper.cc')
| -rw-r--r-- | chrome/browser/sessions/session_service_test_helper.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/sessions/session_service_test_helper.cc b/chrome/browser/sessions/session_service_test_helper.cc index 401c59c..a8ee464 100644 --- a/chrome/browser/sessions/session_service_test_helper.cc +++ b/chrome/browser/sessions/session_service_test_helper.cc @@ -42,7 +42,7 @@ void SessionServiceTestHelper::AssertTabEquals(SessionID& window_id, SessionID& tab_id, int visual_index, int nav_index, - int nav_count, + size_t nav_count, const SessionTab& session_tab) { EXPECT_EQ(window_id.id(), session_tab.window_id.id()); EXPECT_EQ(tab_id.id(), session_tab.tab_id.id()); @@ -52,7 +52,7 @@ void SessionServiceTestHelper::AssertTabEquals(SessionID& window_id, void SessionServiceTestHelper::AssertTabEquals( int visual_index, int nav_index, - int nav_count, + size_t nav_count, const SessionTab& session_tab) { EXPECT_EQ(visual_index, session_tab.tab_visual_index); EXPECT_EQ(nav_index, session_tab.current_navigation_index); @@ -72,9 +72,9 @@ void SessionServiceTestHelper::AssertNavigationEquals( void SessionServiceTestHelper::AssertSingleWindowWithSingleTab( const std::vector<SessionWindow*>& windows, - int nav_count) { - ASSERT_EQ(1, windows.size()); - EXPECT_EQ(1, windows[0]->tabs.size()); + size_t nav_count) { + ASSERT_EQ(1U, windows.size()); + EXPECT_EQ(1U, windows[0]->tabs.size()); EXPECT_EQ(nav_count, windows[0]->tabs[0]->navigations.size()); } |