Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

BUG=none
TEST=none
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/10384106

TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10332117

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

5 files changed, 18 insertions, 21 deletions

diff --git a/chrome/browser/protector/base_setting_change.h b/chrome/browser/protector/base_setting_change.h
index 91bcb8c..d378af2 100644
--- a/chrome/browser/protector/base_setting_change.h
+++ b/chrome/browser/protector/base_setting_change.h
@@ -10,7 +10,7 @@
 
 #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;
@@ -144,9 +144,9 @@ BaseSettingChange* CreateDefaultSearchProviderChange(TemplateURL* actual,
 // 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,
diff --git a/chrome/browser/protector/composite_settings_change.h b/chrome/browser/protector/composite_settings_change.h
index eeb5135..727dd93 100644
--- a/chrome/browser/protector/composite_settings_change.h
+++ b/chrome/browser/protector/composite_settings_change.h
@@ -8,7 +8,6 @@
 
 #include <queue>
 
-#include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/protector/base_setting_change.h"
 
diff --git a/chrome/browser/protector/homepage_change.cc b/chrome/browser/protector/homepage_change.cc
index 0614d06..c6d1c87 100644
--- a/chrome/browser/protector/homepage_change.cc
+++ b/chrome/browser/protector/homepage_change.cc
@@ -6,7 +6,6 @@
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/protector/base_prefs_change.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/protector/session_startup_change.cc b/chrome/browser/protector/session_startup_change.cc
index 35e67fd..86595d1 100644
--- a/chrome/browser/protector/session_startup_change.cc
+++ b/chrome/browser/protector/session_startup_change.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
-#include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ -28,9 +27,9 @@ namespace protector {
 class SessionStartupChange : public BasePrefsChange {
  public:
   SessionStartupChange(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 overrides:
   virtual bool Init(Profile* profile) OVERRIDE;
@@ -56,21 +55,21 @@ class SessionStartupChange : public BasePrefsChange {
   GURL GetFirstNewURL() const;
 
   // Opens all tabs in |tabs| and makes them pinned.
-  void OpenPinnedTabs(Browser* browser, const StartupTabs& tabs);
+  void OpenPinnedTabs(Browser* browser, const PinnedTabCodec::Tabs& tabs);
 
   const SessionStartupPref new_startup_pref_;
   const SessionStartupPref backup_startup_pref_;
-  const StartupTabs new_pinned_tabs_;
-  const StartupTabs backup_pinned_tabs_;
+  const PinnedTabCodec::Tabs new_pinned_tabs_;
+  const PinnedTabCodec::Tabs backup_pinned_tabs_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStartupChange);
 };
 
 SessionStartupChange::SessionStartupChange(
     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)
     : new_startup_pref_(actual_startup_pref),
       backup_startup_pref_(backup_startup_pref),
       new_pinned_tabs_(actual_pinned_tabs),
@@ -205,8 +204,9 @@ GURL SessionStartupChange::GetFirstNewURL() const {
   return new_urls[0];
 }
 
-void SessionStartupChange::OpenPinnedTabs(Browser* browser,
-                                          const StartupTabs& tabs) {
+void SessionStartupChange::OpenPinnedTabs(
+    Browser* browser,
+    const PinnedTabCodec::Tabs& tabs) {
   for (size_t i = 0; i < tabs.size(); ++i) {
     browser::NavigateParams params(browser, tabs[i].url,
                                    content::PAGE_TRANSITION_START_PAGE);
@@ -220,9 +220,9 @@ void SessionStartupChange::OpenPinnedTabs(Browser* browser,
 
 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) {
   return new SessionStartupChange(actual_startup_pref, actual_pinned_tabs,
                                   backup_startup_pref, backup_pinned_tabs);
 }
diff --git a/chrome/browser/protector/session_startup_change_unittest.cc b/chrome/browser/protector/session_startup_change_unittest.cc
index 38de32c..abfbf24 100644
--- a/chrome/browser/protector/session_startup_change_unittest.cc
+++ b/chrome/browser/protector/session_startup_change_unittest.cc
@@ -7,7 +7,6 @@
 #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"
@@ -43,7 +42,7 @@ class SessionStartupChangeTest : public testing::Test {
  protected:
   TestingProfile profile_;
   SessionStartupPref initial_startup_pref_;
-  StartupTabs empty_pinned_tabs_;
+  PinnedTabCodec::Tabs empty_pinned_tabs_;
 };
 
 TEST_F(SessionStartupChangeTest, InitAndApply) {
@@ -104,8 +103,8 @@ TEST_F(SessionStartupChangeTest, ApplyButtonCaptions) {
   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(