[Mac] Re-enable pinned tabs; add support for mini-tabs and phantom tabs.

chrome/browser/sessions/session_service_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 563 matching lines @@
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()));
 
   helper_.AssertSingleWindowWithSingleTab(windows.get(), 1);
   EXPECT_TRUE(app_id == windows[0]->tabs[0]->app_extension_id);
 }
 
 // Explicitly set the pinned state to true and make sure we get back true.
 TEST_F(SessionServiceTest, PinnedTrue) {
-  if (!browser_defaults::kEnablePinnedTabs)
-    return;
-
   EXPECT_TRUE(CreateAndWriteSessionWithOneTab(true, true));
 }
 
 class GetCurrentSessionCallbackHandler {
  public:
   void OnGotSession(int handle, std::vector<SessionWindow*>* windows) {
     EXPECT_EQ(1U, windows->size());
     EXPECT_EQ(2U, (*windows)[0]->tabs.size());
     EXPECT_EQ(2U, (*windows)[0]->tabs[0]->navigations.size());
     EXPECT_EQ(GURL("http://bar/1"),
@@ skipping 12 matching lines @@
   AddTab(browser(), GURL("http://foo/1"));
   NavigateAndCommitActiveTab(GURL("http://foo/2"));
   AddTab(browser(), GURL("http://bar/1"));
   NavigateAndCommitActiveTab(GURL("http://bar/2"));
 
   CancelableRequestConsumer consumer;
   GetCurrentSessionCallbackHandler handler;
   service()->GetCurrentSession(&consumer,
       NewCallback(&handler, &GetCurrentSessionCallbackHandler::OnGotSession));
 }