diff options
| -rw-r--r-- | chrome/browser/browser_commands_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/web_contents_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 5 |
3 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index 699e01a..9916d05 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -59,7 +59,7 @@ TEST_F(BrowserCommandsTest, DuplicateTab) { browser()->ExecuteCommand(IDC_DUPLICATE_TAB); // The duplicated tab should not end up in a new window. - int window_count = BrowserList::size(); + size_t window_count = BrowserList::size(); ASSERT_EQ(initial_window_count, window_count); // And we should have a newly duplicated tab. diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc index 134b43a..85458cb 100644 --- a/chrome/browser/tab_contents/web_contents_unittest.cc +++ b/chrome/browser/tab_contents/web_contents_unittest.cc @@ -206,7 +206,8 @@ TEST_F(WebContentsTest, UpdateTitle) { controller()->RendererDidNavigate(params, &details); contents()->UpdateTitle(rvh(), 0, L" Lots O' Whitespace\n"); - EXPECT_EQ(std::wstring(L"Lots O' Whitespace"), contents()->GetTitle()); + EXPECT_EQ(std::wstring(L"Lots O' Whitespace"), + UTF16ToWideHack(contents()->GetTitle())); } // Test simple same-SiteInstance navigation. diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c4431e2..c89fa1b 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1933,7 +1933,6 @@ 'browser/sessions/session_service_test_helper.h', 'browser/sessions/session_service_unittest.cc', 'browser/sessions/tab_restore_service_unittest.cc', - 'browser/tab_contents/web_contents_unittest.cc', 'browser/tabs/tab_strip_model_unittest.cc', 'browser/views/bookmark_editor_view_unittest.cc', 'browser/views/find_bar_win_unittest.cc', @@ -1956,12 +1955,8 @@ 'test/in_process_browser_test.h', 'test/test_notification_tracker.cc', 'test/test_notification_tracker.h', - 'test/test_tab_contents.cc', - 'test/test_tab_contents.h', 'test/ui_test_utils.cc', 'test/ui_test_utils.h', - 'test/v8_unit_test.cc', - 'test/v8_unit_test.h', ], }], ], |