Revert "FBTF: Move the TabRestoreService::Observer into its own file."

chrome/browser/sessions/session_types.h

 // Copyright (c) 2006-2008 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_SESSIONS_SESSION_TYPES_H_
 #define CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 // TabNavigation corresponds to the parts of NavigationEntry needed to restore
 // the NavigationEntry during session restore and tab restore.
 //
 // TabNavigation is cheap and supports copy semantics.
 class TabNavigation {
  public:
   enum TypeMask {
     HAS_POST_DATA = 1
   };
 
-  TabNavigation();
+  TabNavigation()
+      : transition_(PageTransition::TYPED),
+        type_mask_(0),
+        index_(-1) {
+  }
+
   TabNavigation(int index,
                 const GURL& virtual_url,
                 const GURL& referrer,
                 const string16& title,
                 const std::string& state,
-                PageTransition::Type transition);
-  TabNavigation(const TabNavigation& tab);
-  ~TabNavigation();
-  TabNavigation& operator=(const TabNavigation& tab);
+                PageTransition::Type transition)
+      : virtual_url_(virtual_url),
+        referrer_(referrer),
+        title_(title),
+        state_(state),
+        transition_(transition),
+        type_mask_(0),
+        index_(index) {}
 
   // Converts this TabNavigation into a NavigationEntry with a page id of
   // |page_id|. The caller owns the returned NavigationEntry.
   NavigationEntry* ToNavigationEntry(int page_id, Profile* profile) const;
 
   // Resets this TabNavigation from |entry|.
   void SetFromNavigationEntry(const NavigationEntry& entry);
 
   // Virtual URL of the page. See NavigationEntry::virtual_url() for details.
   void set_virtual_url(const GURL& url) { virtual_url_ = url; }
@@ skipping 37 matching lines @@
   PageTransition::Type transition_;
   int type_mask_;
 
   int index_;
 };
 
 // SessionTab ----------------------------------------------------------------
 
 // SessionTab corresponds to a NavigationController.
 struct SessionTab {
-  SessionTab();
-  ~SessionTab();
+  SessionTab()
+      : tab_visual_index(-1),
+        current_navigation_index(-1),
+        pinned(false) { }
 
   // Unique id of the window.
   SessionID window_id;
 
   // Unique if of the tab.
   SessionID tab_id;
 
   // Visual index of the tab within its window. There may be gaps in these
   // values.
   //
@@ skipping 71 matching lines @@
   ForeignSession();
   ~ForeignSession();
 
   // Unique tag for each session.
   std::string foreign_tession_tag;
   std::vector<SessionWindow*> windows;
 };
 
 #endif  // CHROME_BROWSER_SESSIONS_SESSION_TYPES_H_