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

chrome/browser/cocoa/history_menu_bridge.h

Index: chrome/browser/cocoa/history_menu_bridge.h
diff --git a/chrome/browser/cocoa/history_menu_bridge.h b/chrome/browser/cocoa/history_menu_bridge.h
index 2743752367f96489aa98e4c83f5f97321e41a96d..55dab4d48e40270f71ab5b9968f493ec753895b6 100644
--- a/chrome/browser/cocoa/history_menu_bridge.h
+++ b/chrome/browser/cocoa/history_menu_bridge.h
@@ -16,7 +16,6 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/sessions/tab_restore_service_observer.h"
 #include "chrome/common/notification_observer.h"
 
 class NavigationEntry;
@@ -24,7 +23,6 @@ class NotificationRegistrar;
 class PageUsageData;
 class Profile;
 class TabNavigationEntry;
-class TabRestoreService;
 @class HistoryMenuCocoaController;
 
 namespace {
@@ -56,16 +54,26 @@ class HistoryMenuBridgeTest;
 // controller is very thin and only exists to interact with Cocoa, but this
 // class does the bulk of the work.
 class HistoryMenuBridge : public NotificationObserver,
-                          public TabRestoreServiceObserver {
+                          public TabRestoreService::Observer {
  public:
   // This is a generalization of the data we store in the history menu because
   // we pull things from different sources with different data types.
   struct HistoryItem {
    public:
-    HistoryItem();
+    HistoryItem()
+        : icon_requested(false),
+          menu_item(nil),
+          session_id(0) {}
+
     // Copy constructor allowed.
-    HistoryItem(const HistoryItem& copy);
-    ~HistoryItem();
+    HistoryItem(const HistoryItem& copy)
+        : title(copy.title),
+          url(copy.url),
+          icon_requested(false),
+          menu_item(nil),
+          session_id(copy.session_id) {}
+
+    ~HistoryItem() {}
 
     // The title for the menu item.
     string16 title;
@@ -128,7 +136,7 @@ class HistoryMenuBridge : public NotificationObserver,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // For TabRestoreServiceObserver
+  // For TabRestoreService::Observer
   virtual void TabRestoreServiceChanged(TabRestoreService* service);
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service);