Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/protector/session_startup_change_unittest.cc

 // Copyright (c) 2012 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/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/protector/base_setting_change.h"
-#include "chrome/browser/ui/startup/startup_tab.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
 
 namespace {
 
 const char kStartupUrl1[] = "http://google.com";
@@ skipping 15 matching lines @@
   }
 
   virtual void SetUp() OVERRIDE {
     // Ensure initial session startup pref.
     SessionStartupPref::SetStartupPref(&profile_, initial_startup_pref_);
   }
 
  protected:
   TestingProfile profile_;
   SessionStartupPref initial_startup_pref_;
-  StartupTabs empty_pinned_tabs_;
+  PinnedTabCodec::Tabs empty_pinned_tabs_;
 };
 
 TEST_F(SessionStartupChangeTest, InitAndApply) {
   // Create a change and apply it.
   SessionStartupPref backup_startup_pref(SessionStartupPref::LAST);
   scoped_ptr<BaseSettingChange> change(
       CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
                                  backup_startup_pref, empty_pinned_tabs_));
   ASSERT_TRUE(change->Init(&profile_));
   // Setting is initially reverted to backup.
@@ skipping 40 matching lines @@
   SessionStartupPref backup_startup_pref(SessionStartupPref::DEFAULT);
   scoped_ptr<BaseSettingChange> change(
       CreateSessionStartupChange(initial_startup_pref_, empty_pinned_tabs_,
                                  backup_startup_pref, empty_pinned_tabs_));
   ASSERT_TRUE(change->Init(&profile_));
   EXPECT_EQ(open_ntp_caption, change->GetApplyButtonText());
   EXPECT_EQ(GURL(), change->GetNewSettingURL());
   EXPECT_EQ(kNoDisplayName, change->GetApplyDisplayName());
 
   // Pinned tabs count as startup URLs as well.
-  StartupTabs new_pinned_tabs;
-  StartupTab pinned_tab;
+  PinnedTabCodec::Tabs new_pinned_tabs;
+  StartupBrowserCreator::LaunchWithProfile::Tab pinned_tab;
   pinned_tab.url = GURL(kStartupUrl3);
   new_pinned_tabs.push_back(pinned_tab);
   change.reset(
       CreateSessionStartupChange(initial_startup_pref_, new_pinned_tabs,
                                  backup_startup_pref, empty_pinned_tabs_));
   ASSERT_TRUE(change->Init(&profile_));
   EXPECT_EQ(open_url3_etc_caption, change->GetApplyButtonText());
   EXPECT_EQ(GURL(kStartupUrl3), change->GetNewSettingURL());
   EXPECT_EQ(UTF8ToUTF16(kStartupHost3), change->GetApplyDisplayName().second);
 
@@ skipping 63 matching lines @@
   change.reset(
       CreateSessionStartupChange(initial_startup_pref_, new_pinned_tabs,
                                  backup_startup_pref, empty_pinned_tabs_));
   ASSERT_TRUE(change->Init(&profile_));
   EXPECT_EQ(open_url3_etc_caption, change->GetApplyButtonText());
   EXPECT_EQ(GURL(kStartupUrl3), change->GetNewSettingURL());
   EXPECT_EQ(UTF8ToUTF16(kStartupHost3), change->GetApplyDisplayName().second);
 }
 
 }  // namespace protector