Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/protector/base_setting_change.h

 // 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.
 
 #ifndef CHROME_BROWSER_PROTECTOR_BASE_SETTING_CHANGE_H_
 #define CHROME_BROWSER_PROTECTOR_BASE_SETTING_CHANGE_H_
 #pragma once
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "chrome/browser/ui/startup/startup_tab.h"
+#include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "googleurl/src/gurl.h"
 
 class Browser;
 class Profile;
 class TemplateURL;
 struct SessionStartupPref;
 
 namespace protector {
 
 class CompositeSettingsChange;
@@ skipping 113 matching lines @@
 // |backup| will be owned by the returned |BaseSettingChange| instance. |actual|
 // is not owned and is safe to destroy after Protector::ShowChange has been
 // called for the returned instance.
 BaseSettingChange* CreateDefaultSearchProviderChange(TemplateURL* actual,
                                                      TemplateURL* backup);
 
 // Allocates and initializes BaseSettingChange implementation for session
 // startup setting, including the pinned tabs. Reports corresponding histograms.
 BaseSettingChange* CreateSessionStartupChange(
     const SessionStartupPref& actual_startup_pref,
-    const StartupTabs& actual_pinned_tabs,
+    const PinnedTabCodec::Tabs& actual_pinned_tabs,
     const SessionStartupPref& backup_startup_pref,
-    const StartupTabs& backup_pinned_tabs);
+    const PinnedTabCodec::Tabs& backup_pinned_tabs);
 
 BaseSettingChange* CreateHomepageChange(
     const std::string& actual_homepage,
     bool actual_homepage_is_ntp,
     bool actual_show_homepage,
     const std::string& backup_homepage,
     bool backup_homepage_is_ntp,
     bool backup_show_homepage);
 
 // Allocates and initializes BaseSettingChange implementation for an unknown
 // preferences change with invalid backup.
 BaseSettingChange* CreatePrefsBackupInvalidChange();
 
 }  // namespace protector
 
 #endif  // CHROME_BROWSER_PROTECTOR_BASE_SETTING_CHANGE_H_