Remove WebBrowserEventSink from chrome frame code, which necessitated some refactor/cleanup in the chrome frame reliability tests.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3304004

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

1 files changed, 11 insertions, 9 deletions

diff --git a/chrome_frame/test/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h
index 189d98e..fd21317 100644
--- a/chrome_frame/test/ie_event_sink.h
+++ b/chrome_frame/test/ie_event_sink.h
@@ -67,8 +67,6 @@ class PropertyNotifySinkListener {
 
 // This class sets up event sinks to the IWebBrowser interface. It forwards
 // all events to its listener.
-// TODO(kkania): Delete WebBrowserEventSink and use this class instead for
-// the reliability tests.
 class IEEventSink
     : public CComObjectRootEx<CComSingleThreadModel>,
       public IDispEventSimpleImpl<0, IEEventSink,
@@ -85,10 +83,21 @@ class IEEventSink
   IEEventSink();
   ~IEEventSink();
 
+  // Launches IE, sets up the sink to forward events to the listener, and
+  // navigates to the given page.
+  HRESULT LaunchIEAndNavigate(const std::wstring& navigate_url,
+                              IEEventListener* listener);
+
+  // Navigate to the given url.
+  HRESULT Navigate(const std::wstring& navigate_url);
+
   // Listen to events from this |browser_disp|, which should be queryable for
   // IWebBrowser2.
   void Attach(IDispatch* browser_disp);
 
+  // Listen to events from the given browser.
+  HRESULT Attach(IWebBrowser2* browser);
+
   // Stop listening to the associated web browser and possibly wait for it to
   // close, if this browser has its own process.
   void Uninitialize();
@@ -123,13 +132,6 @@ class IEEventSink
   // In that case, the returned handle will be NULL.
   HWND GetRendererWindowSafe();
 
-  // Launch IE, use the given listener, and navigate to the given url.
-  HRESULT LaunchIEAndNavigate(const std::wstring& navigate_url,
-                              IEEventListener* listener);
-
-  // Navigate to the given url.
-  HRESULT Navigate(const std::wstring& navigate_url);
-
   // Returns whether CF is rendering the current page.
   bool IsCFRendering();