diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 23:12:37 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-20 23:12:37 +0000 |
| commit | 1ce036139aba74ac80a94100c315d56a4eabcae2 (patch) | |
| tree | bc65e4311e04b7d6f1cfc97c695f830b6435f882 /chrome | |
| parent | 3060ce78db15f4a923d949ab5c1aaa5f75a1a066 (diff) | |
| download | chromium_src-1ce036139aba74ac80a94100c315d56a4eabcae2.zip chromium_src-1ce036139aba74ac80a94100c315d56a4eabcae2.tar.gz chromium_src-1ce036139aba74ac80a94100c315d56a4eabcae2.tar.bz2 | |
Another fix in in_memory_url_index_unittest compilation for Android.
Due to oddities in STLPort, the gtest macros have some incompatibilities
when outputting failure information for some iterators. Changing from
ASSERT_NE to an equivalent ASSERT_TRUE avoid this auto-generated
output.
See also: http://codereview.chromium.org/9649006/
I looked into gtest a bit and tried define a PrintTo for some of these
types but I wasn't able to fix it that way.
BUG=117407
TEST=
Review URL: http://codereview.chromium.org/9701062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/history/in_memory_url_index_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc index 8796cc2..4be8c07 100644 --- a/chrome/browser/history/in_memory_url_index_unittest.cc +++ b/chrome/browser/history/in_memory_url_index_unittest.cc @@ -314,7 +314,7 @@ void InMemoryURLIndexTest::ExpectPrivateDataEqual( expected_info != expected.history_info_map_.end(); ++expected_info) { HistoryInfoMap::const_iterator actual_info = actual.history_info_map_.find(expected_info->first); - ASSERT_NE(actual_info, actual.history_info_map_.end()); + ASSERT_TRUE(actual_info != actual.history_info_map_.end()); const URLRow& expected_row(expected_info->second); const URLRow& actual_row(actual_info->second); EXPECT_EQ(expected_row.visit_count(), actual_row.visit_count()); @@ -329,7 +329,7 @@ void InMemoryURLIndexTest::ExpectPrivateDataEqual( ++expected_starts) { WordStartsMap::const_iterator actual_starts = actual.word_starts_map_.find(expected_starts->first); - ASSERT_NE(actual_starts, actual.word_starts_map_.end()); + ASSERT_TRUE(actual_starts != actual.word_starts_map_.end()); const RowWordStarts& expected_word_starts(expected_starts->second); const RowWordStarts& actual_word_starts(actual_starts->second); EXPECT_EQ(expected_word_starts.url_word_starts_.size(), |