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

chrome/browser/tabs/tab_strip_model_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/dock_info.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/profile.h"
@@ skipping 62 matching lines @@
 
 class TabStripModelTest : public RenderViewHostTestHarness {
  public:
   TabContents* CreateTabContents() {
     return new TabContents(profile(), NULL, 0, NULL);
   }
 
   // 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) {
     controller().GoBack();
   }
 
   void GoForward(TabContents* contents) {
     controller().GoForward();
   }
 
@@ skipping 24 matching lines @@
   };
 
   struct State {
     State(TabContents* a_dst_contents,
           int a_dst_index,
           TabStripModelObserverAction a_action)
         : src_contents(NULL),
           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;
     TabContents* dst_contents;
     int src_index;
     int dst_index;
     bool user_gesture;
     bool foreground;
     TabStripModelObserverAction action;
   };
@@ skipping 456 matching lines @@
 //     is selected
 //     If there are no other tabs that have the same opener,
 //       The opener is selected
 //
 TEST_F(TabStripModelTest, TestSelectOnClose) {
   TabStripDummyDelegate delegate(NULL);
   TabStripModel tabstrip(&delegate, profile());
   EXPECT_TRUE(tabstrip.empty());
 
   TabContents* opener_contents = CreateTabContents();
-  NavigationController* opener = &opener_contents->controller();
   tabstrip.AppendTabContents(opener_contents, true);
 
   TabContents* contents1 = CreateTabContents();
   TabContents* contents2 = CreateTabContents();
   TabContents* contents3 = CreateTabContents();
 
   // Note that we use Detach instead of Close throughout this test to avoid
   // having to keep reconstructing these TabContentses.
 
   // First test that closing tabs that are in the background doesn't adjust the
@@ skipping 57 matching lines @@
 //  - Close Tab
 //  - Close Other Tabs
 //  - Close Tabs To Right
 //  - Close Tabs Opened By
 TEST_F(TabStripModelTest, TestContextMenuCloseCommands) {
   TabStripDummyDelegate delegate(NULL);
   TabStripModel tabstrip(&delegate, profile());
   EXPECT_TRUE(tabstrip.empty());
 
   TabContents* opener_contents = CreateTabContents();
-  NavigationController* opener = &opener_contents->controller();
   tabstrip.AppendTabContents(opener_contents, true);
 
   TabContents* contents1 = CreateTabContents();
   TabContents* contents2 = CreateTabContents();
   TabContents* contents3 = CreateTabContents();
 
   InsertTabContentses(&tabstrip, contents1, contents2, contents3);
   EXPECT_EQ(0, tabstrip.selected_index());
 
   tabstrip.ExecuteContextMenuCommand(2, TabStripModel::CommandCloseTab);
@@ skipping 506 matching lines @@
 
   // Now select the last tab.
   strip.SelectTabContentsAt(strip.count() - 1, true);
 
   // Now close the last tab. The next adjacent should be selected.
   strip.CloseTabContentsAt(strip.count() - 1);
   EXPECT_EQ(page_d_contents, strip.GetTabContentsAt(strip.selected_index()));
 
   strip.CloseAllTabs();
 }