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

chrome/browser/browser.h

Index: chrome/browser/browser.h
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 3637871bc08488ff8ed85eca10ce627fd2048eed..e2c9c367acf4078efbc5319a13c2c28edd723f1a 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -14,12 +14,11 @@
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/debugger/devtools_toggle_action.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/sessions/tab_restore_service_observer.h"
+#include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/sync/profile_sync_service_observer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ -51,7 +50,7 @@ class Browser : public TabStripModelDelegate,
                 public CommandUpdater::CommandUpdaterDelegate,
                 public NotificationObserver,
                 public SelectFileDialog::Listener,
-                public TabRestoreServiceObserver,
+                public TabRestoreService::Observer,
                 public ProfileSyncServiceObserver {
  public:
   // If you change the values in this enum you'll need to update browser_proxy.
@@ -620,7 +619,7 @@ class Browser : public TabStripModelDelegate,
   // Helper function to run unload listeners on a TabContents.
   static bool RunUnloadEventsHelper(TabContents* contents);
 
-  // TabRestoreServiceObserver /////////////////////////////////////////////////
+  // TabRestoreService::Observer ///////////////////////////////////////////////
   virtual void TabRestoreServiceChanged(TabRestoreService* service);
   virtual void TabRestoreServiceDestroyed(TabRestoreService* service);