summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorshess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-22 20:41:40 +0000
committershess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-22 20:41:40 +0000
commit8bae513520fc53ca13c5709398dfe21c7509721b (patch)
tree4ae3f73de7513793cf2acc0b03c885b5eadb3522 /chrome
parent5fe8d3e57fc0ff4d29fed2621acb64e272e12550 (diff)
downloadchromium_src-8bae513520fc53ca13c5709398dfe21c7509721b.zip
chromium_src-8bae513520fc53ca13c5709398dfe21c7509721b.tar.gz
chromium_src-8bae513520fc53ca13c5709398dfe21c7509721b.tar.bz2
Free unit tests for Mac: BookmarkHTMLWriterTest, BookmarkUtilsTest,
DownloadRequestManagerTest, URLFetcher*Test, TimeFormat, RenderWidgetTest Review URL: http://codereview.chromium.org/50081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/bookmarks/bookmark_utils_unittest.cc6
-rw-r--r--chrome/browser/net/url_fetcher_unittest.cc4
-rw-r--r--chrome/chrome.gyp6
-rw-r--r--chrome/renderer/render_widget_unittest.cc4
4 files changed, 7 insertions, 13 deletions
diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
index bbd49cc..2192bc4 100644
--- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
@@ -22,19 +22,19 @@ TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) {
std::vector<BookmarkNode*> nodes;
bookmark_utils::GetBookmarksContainingText(&model, L"foo", 100, &nodes);
- ASSERT_EQ(1, nodes.size());
+ ASSERT_EQ(static_cast<size_t>(1), nodes.size());
EXPECT_TRUE(nodes[0] == n1);
EXPECT_TRUE(bookmark_utils::DoesBookmarkContainText(n1, L"foo"));
nodes.clear();
bookmark_utils::GetBookmarksContainingText(&model, L"cnn", 100, &nodes);
- ASSERT_EQ(1, nodes.size());
+ ASSERT_EQ(static_cast<size_t>(1), nodes.size());
EXPECT_TRUE(nodes[0] == n2);
EXPECT_TRUE(bookmark_utils::DoesBookmarkContainText(n2, L"cnn"));
nodes.clear();
bookmark_utils::GetBookmarksContainingText(&model, L"foo bar", 100, &nodes);
- ASSERT_EQ(1, nodes.size());
+ ASSERT_EQ(static_cast<size_t>(1), nodes.size());
EXPECT_TRUE(nodes[0] == n1);
EXPECT_TRUE(bookmark_utils::DoesBookmarkContainText(n1, L"foo bar"));
nodes.clear();
diff --git a/chrome/browser/net/url_fetcher_unittest.cc b/chrome/browser/net/url_fetcher_unittest.cc
index 6ac3614..bb44813 100644
--- a/chrome/browser/net/url_fetcher_unittest.cc
+++ b/chrome/browser/net/url_fetcher_unittest.cc
@@ -333,8 +333,6 @@ void URLFetcherCancelTest::TestContextReleased() {
io_loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask());
}
-} // namespace.
-
TEST_F(URLFetcherTest, SameThreadsTest) {
// Create the fetcher on the main thread. Since IO will happen on the main
// thread, this will test URLFetcher's ability to do everything on one
@@ -462,3 +460,5 @@ TEST_F(URLFetcherCancelTest, ReleasesContext) {
MessageLoop::current()->Run();
}
+
+} // namespace.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6f3bf2a..d0a4246 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2169,19 +2169,15 @@
'browser/back_forward_menu_model_unittest.cc',
'browser/bookmarks/bookmark_drag_data_unittest.cc',
'browser/bookmarks/bookmark_folder_tree_model_unittest.cc',
- 'browser/bookmarks/bookmark_html_writer_unittest.cc',
'browser/bookmarks/bookmark_table_model_unittest.cc',
- 'browser/bookmarks/bookmark_utils_unittest.cc',
'browser/browser_commands_unittest.cc',
'browser/download/download_manager_unittest.cc',
- 'browser/download/download_request_manager_unittest.cc',
'browser/extensions/user_script_master_unittest.cc',
'browser/importer/firefox_importer_unittest.cc',
'browser/importer/importer_unittest.cc',
'browser/login_prompt_unittest.cc',
'browser/navigation_controller_unittest.cc',
'browser/net/resolve_proxy_msg_helper_unittest.cc',
- 'browser/net/url_fetcher_unittest.cc',
'browser/password_manager/encryptor_unittest.cc',
'browser/password_manager/password_form_manager_unittest.cc',
'browser/printing/page_number_unittest.cc',
@@ -2206,9 +2202,7 @@
'common/net/url_util_unittest.cc',
'common/os_exchange_data_unittest.cc',
'common/pref_service_unittest.cc',
- 'common/time_format_unittest.cc',
'renderer/render_view_unittest.cc',
- 'renderer/render_widget_unittest.cc',
'test/browser_with_test_window_test.cc',
'test/browser_with_test_window_test.h',
'test/in_process_browser_test.cc',
diff --git a/chrome/renderer/render_widget_unittest.cc b/chrome/renderer/render_widget_unittest.cc
index 6937a64..b649725f 100644
--- a/chrome/renderer/render_widget_unittest.cc
+++ b/chrome/renderer/render_widget_unittest.cc
@@ -41,8 +41,6 @@ class RenderWidgetTest : public testing::Test {
scoped_ptr<MockProcess> mock_process_;
};
-} // namespace
-
TEST_F(RenderWidgetTest, CreateAndCloseWidget) {
// After the RenderWidget it must have sent a message to the render thread
// that sets the opener id.
@@ -57,3 +55,5 @@ TEST_F(RenderWidgetTest, CreateAndCloseWidget) {
msg_loop_.PostTask(FROM_HERE, new MessageLoop::QuitTask());
msg_loop_.Run();
}
+
+} // namespace