Port 2 more unittests to linux/mac. Just some small compiler warnings.

This ports find_backend_unittest.cc and tab_strip_model_unittest.cc.

Review URL: http://codereview.chromium.org/119055


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17424 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 10 deletions

diff --git a/chrome/browser/find_backend_unittest.cc b/chrome/browser/find_backend_unittest.cc
index 4179cc2..e986d5a 100644
--- a/chrome/browser/find_backend_unittest.cc
+++ b/chrome/browser/find_backend_unittest.cc
@@ -23,9 +23,9 @@ TEST_F(FindBackendTest, InternalState) {
   EXPECT_EQ(string16(), contents2.find_prepopulate_text());
   EXPECT_EQ(string16(), contents2.find_text());
 
-  string16 search_term1 = L" I had a 401K    ";
-  string16 search_term2 = L" but the economy ";
-  string16 search_term3 = L" eated it.       ";
+  string16 search_term1 = ASCIIToUTF16(" I had a 401K    ");
+  string16 search_term2 = ASCIIToUTF16(" but the economy ");
+  string16 search_term3 = ASCIIToUTF16(" eated it.       ");
 
   // Start searching in the first TabContents, searching forwards but not case
   // sensitive (as indicated by the last two params).
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index a5b63a7..399aac3 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -80,7 +80,7 @@ class TabStripModelTest : public RenderViewHostTestHarness {
   // Forwards a URL "load" request through to our dummy TabContents
   // implementation.
   void LoadURL(TabContents* con, const std::wstring& url) {
-    controller().LoadURL(GURL(url), GURL(), PageTransition::LINK);
+    controller().LoadURL(GURL(WideToUTF16(url)), GURL(), PageTransition::LINK);
   }
 
   void GoBack(TabContents* contents) {
@@ -125,9 +125,9 @@ class MockTabStripModelObserver : public TabStripModelObserver {
           dst_contents(a_dst_contents),
           src_index(-1),
           dst_index(a_dst_index),
-          action(a_action),
           user_gesture(false),
-          foreground(false) {
+          foreground(false),
+          action(a_action) {
     }
 
     TabContents* src_contents;
@@ -604,7 +604,6 @@ TEST_F(TabStripModelTest, TestSelectOnClose) {
   EXPECT_TRUE(tabstrip.empty());
 
   TabContents* opener_contents = CreateTabContents();
-  NavigationController* opener = &opener_contents->controller();
   tabstrip.AppendTabContents(opener_contents, true);
 
   TabContents* contents1 = CreateTabContents();
@@ -682,7 +681,6 @@ TEST_F(TabStripModelTest, TestContextMenuCloseCommands) {
   EXPECT_TRUE(tabstrip.empty());
 
   TabContents* opener_contents = CreateTabContents();
-  NavigationController* opener = &opener_contents->controller();
   tabstrip.AppendTabContents(opener_contents, true);
 
   TabContents* contents1 = CreateTabContents();
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index fa16804..d32363c 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3322,7 +3322,6 @@
             'browser/extensions/extension_process_manager_unittest.cc',
             'browser/extensions/extension_view_unittest.cc',
             'browser/extensions/test_extension_loader.cc',
-            'browser/find_backend_unittest.cc',
             'browser/importer/firefox_importer_unittest.cc',
             'browser/importer/importer_unittest.cc',
             'browser/login_prompt_unittest.cc',
@@ -3333,7 +3332,6 @@
             'browser/rlz/rlz_unittest.cc',
             'browser/safe_browsing/safe_browsing_blocking_page_unittest.cc',
             'browser/search_engines/template_url_scraper_unittest.cc',
-            'browser/tabs/tab_strip_model_unittest.cc',
             'browser/views/bookmark_editor_view_unittest.cc',
             'browser/views/find_bar_win_unittest.cc',
             'browser/views/keyword_editor_view_unittest.cc',