Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/protector/composite_settings_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_COMPOSITE_SETTINGS_CHANGE_H_
 #define CHROME_BROWSER_PROTECTOR_COMPOSITE_SETTINGS_CHANGE_H_
 #pragma once
 
 #include <queue>
 
-#include "base/compiler_specific.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/protector/base_setting_change.h"
 
 namespace protector {
 
 // Class for tracking multiple settings changes as a single change.
 class CompositeSettingsChange : public BaseSettingChange {
  public:
   CompositeSettingsChange();
   virtual ~CompositeSettingsChange();
@@ skipping 22 matching lines @@
   // Display names of merged changes, sorted by their priority. The name with
   // the highest priority is picked.
   std::priority_queue<DisplayName> apply_names_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositeSettingsChange);
 };
 
 }  // namespace protector
 
 #endif  // CHROME_BROWSER_PROTECTOR_COMPOSITE_SETTINGS_CHANGE_H_