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

chrome/browser/automation/testing_automation_provider.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.
 
 #ifndef CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #define CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/automation/automation_event_observers.h"
 #include "chrome/browser/automation/automation_event_queue.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_provider_json.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/importer/importer_list_observer.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
-#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/browser_list_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/common/page_type.h"
 #include "content/public/common/security_style.h"
 #include "net/base/cert_status_flags.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
 #if defined(OS_CHROMEOS)
 // TODO(sque): move to a ChromeOS-specific class. See crosbug.com/22081.
 class PowerManagerClientObserverForTesting;
 #endif  // defined(OS_CHROMEOS)
@@ skipping 14 matching lines @@
 namespace gfx {
 class Rect;
 }
 
 namespace webkit {
 struct WebPluginInfo;
 }
 
 // This is an automation provider containing testing calls.
 class TestingAutomationProvider : public AutomationProvider,
-                                  public BrowserList::Observer,
+                                  public chrome::BrowserListObserver,
                                   public importer::ImporterListObserver,
                                   public content::NotificationObserver {
  public:
   explicit TestingAutomationProvider(Profile* profile);
 
   virtual IPC::Channel::Mode GetChannelMode(bool use_named_interface);
 
   // IPC::Listener:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
  private:
   // Storage for ImportSettings() to resume operations after a callback.
   struct ImportSettingsData {
     string16 browser_name;
     int import_items;
     bool first_run;
     Browser* browser;
     IPC::Message* reply_message;
   };
 
   virtual ~TestingAutomationProvider();
 
-  // BrowserList::Observer:
+  // chrome::BrowserListObserver:
   virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
   virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
 
   // importer::ImporterListObserver:
   virtual void OnSourceProfilesLoaded() OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
@@ skipping 1489 matching lines @@
   ImportSettingsData import_settings_data_;
 
   // The automation event observer queue. It is lazily created when an observer
   // is added to avoid overhead when not needed.
   scoped_ptr<AutomationEventQueue> automation_event_queue_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_TESTING_AUTOMATION_PROVIDER_H_