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

This means browser.h no longer includes a large chunk of the tab restore
system.

BUG=none
TEST=compiles

Review URL: http://codereview.chromium.org/3296003

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

3 files changed, 25 insertions, 15 deletions

diff --git a/chrome/browser/cocoa/history_menu_bridge.h b/chrome/browser/cocoa/history_menu_bridge.h
index 55dab4d..2743752 100644
--- a/chrome/browser/cocoa/history_menu_bridge.h
+++ b/chrome/browser/cocoa/history_menu_bridge.h
@@ -16,6 +16,7 @@
 #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;
@@ -23,6 +24,7 @@ class NotificationRegistrar;
 class PageUsageData;
 class Profile;
 class TabNavigationEntry;
+class TabRestoreService;
 @class HistoryMenuCocoaController;
 
 namespace {
@@ -54,26 +56,16 @@ 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 TabRestoreService::Observer {
+                          public TabRestoreServiceObserver {
  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()
-        : icon_requested(false),
-          menu_item(nil),
-          session_id(0) {}
-
+    HistoryItem();
     // Copy constructor allowed.
-    HistoryItem(const HistoryItem& copy)
-        : title(copy.title),
-          url(copy.url),
-          icon_requested(false),
-          menu_item(nil),
-          session_id(copy.session_id) {}
-
-    ~HistoryItem() {}
+    HistoryItem(const HistoryItem& copy);
+    ~HistoryItem();
 
     // The title for the menu item.
     string16 title;
@@ -136,7 +128,7 @@ class HistoryMenuBridge : public NotificationObserver,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // For TabRestoreService::Observer
+  // For TabRestoreServiceObserver
   virtual void TabRestoreServiceChanged(TabRestoreService* service);
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service);
 
diff --git a/chrome/browser/cocoa/history_menu_bridge.mm b/chrome/browser/cocoa/history_menu_bridge.mm
index d75043e..10e1bc2 100644
--- a/chrome/browser/cocoa/history_menu_bridge.mm
+++ b/chrome/browser/cocoa/history_menu_bridge.mm
@@ -46,6 +46,23 @@ const unsigned int kRecentlyClosedCount = 10;
 
 }  // namespace
 
+HistoryMenuBridge::HistoryItem::HistoryItem()
+   : icon_requested(false),
+     menu_item(nil),
+     session_id(0) {
+}
+
+HistoryMenuBridge::HistoryItem::HistoryItem(const HistoryItem& copy)
+   : title(copy.title),
+     url(copy.url),
+     icon_requested(false),
+     menu_item(nil),
+     session_id(copy.session_id) {
+}
+
+HistoryMenuBridge::HistoryItem::~HistoryItem() {
+}
+
 HistoryMenuBridge::HistoryMenuBridge(Profile* profile)
     : controller_([[HistoryMenuCocoaController alloc] initWithBridge:this]),
       profile_(profile),
diff --git a/chrome/browser/cocoa/view_id_util_browsertest.mm b/chrome/browser/cocoa/view_id_util_browsertest.mm
index f6fa0c3..94e3aa4 100644
--- a/chrome/browser/cocoa/view_id_util_browsertest.mm
+++ b/chrome/browser/cocoa/view_id_util_browsertest.mm
@@ -11,6 +11,7 @@
 #include "chrome/browser/cocoa/view_id_util.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"