Move implementation of BrowserList onto an inner, instantiatable class, BrowserListImpl.

chrome/browser/profiles/profile_manager.h

 // Copyright (c) 2012 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.
 
 // This class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/startup/startup_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/profiles/profile_shortcut_manager_win.h"
 #endif
 
 class NewProfileLauncher;
 class ProfileInfoCache;
@@ skipping 275 matching lines @@
   // if it has not been explicitly deleted.
   scoped_ptr<ProfileInfoCache> profile_info_cache_;
 
 #if defined(OS_WIN)
   // Manages the creation, deletion, and renaming of Windows shortcuts by
   // observing the ProfileInfoCache.
   scoped_ptr<ProfileShortcutManagerWin> profile_shortcut_manager_;
 #endif
 
 #if !defined(OS_ANDROID)
-  class BrowserListObserver : public BrowserList::Observer {
+  class BrowserListObserver : public chrome::BrowserListObserver {
    public:
     explicit BrowserListObserver(ProfileManager* manager);
     virtual ~BrowserListObserver();
 
-    // BrowserList::Observer implementation.
+    // chrome::BrowserListObserver implementation.
     virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
     virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
     virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
 
    private:
     ProfileManager* profile_manager_;
     DISALLOW_COPY_AND_ASSIGN(BrowserListObserver);
   };
 
   BrowserListObserver browser_list_observer_;
@@ skipping 14 matching lines @@
 class ProfileManagerWithoutInit : public ProfileManager {
  public:
   explicit ProfileManagerWithoutInit(const FilePath& user_data_dir);
 
  protected:
   virtual void DoFinalInitForServices(Profile*, bool) OVERRIDE {}
   virtual void DoFinalInitLogging(Profile*) OVERRIDE {}
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_MANAGER_H_