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

chrome/browser/jumplist_win.h

 // Copyright (c) 2006-2009 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_JUMPLIST_WIN_H_
 #define CHROME_BROWSER_JUMPLIST_WIN_H_
 #pragma once
 
 #include <list>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/sessions/tab_restore_service_observer.h"
 
 class FilePath;
 class Profile;
 class PageUsageData;
 
 // Represents a class used for creating an IShellLink object by the utility
 // functions in this file.
 // This class consists of three strings and a integer.
 // * arguments (std::wstring)
 //   The arguments for the application.
@@ skipping 56 matching lines @@
 typedef std::vector<scoped_refptr<ShellLinkItem> > ShellLinkItemList;
 
 // A class which implements an application JumpList.
 // This class encapsulates operations required for updating an application
 // JumpList:
 // * Retrieving "Most Visited" pages from HistoryService;
 // * Retrieving strings from the application resource;
 // * Creatng COM objects used by JumpList from PageUsageData objects;
 // * Adding COM objects to JumpList, etc.
 //
-// This class also implements TabRestoreServiceObserver. So, once we call
+// This class also implements TabRestoreService::Observer. So, once we call
 // AddObserver() and register this class as an observer, it automatically
 // updates a JumpList when a tab is added or removed.
 //
 // Updating a JumpList requires some file operations and it is not good to
 // update it in a UI thread. To solve this problem, this class posts a
 // task when it actually updates a JumpList. (This task is implemented in an
 // anomynous namespace in "jumplist_win.cc".)
-class JumpList : public TabRestoreServiceObserver {
+class JumpList : public TabRestoreService::Observer {
  public:
   JumpList();
   ~JumpList();
 
   // Registers (or unregisters) this object as an observer.
   // When the TabRestoreService object notifies the tab status is changed, this
   // class automatically updates an application JumpList.
   bool AddObserver(Profile* profile);
   void RemoveObserver();
 
@@ skipping 70 matching lines @@
 
   // Items in the "Recently Closed" category of the application JumpList.
   ShellLinkItemList recently_closed_pages_;
 
   // A list of URLs we need to retrieve their fav icons.
   typedef std::pair<std::string, scoped_refptr<ShellLinkItem> > URLPair;
   std::list<URLPair> icon_urls_;
 };
 
 #endif  // CHROME_BROWSER_JUMPLIST_WIN_H_