diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:55:59 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-01 18:55:59 +0000 |
| commit | 995d592afc0fcee55a67b9f5ebcae7a093de6da0 (patch) | |
| tree | c82c3cf08adeaad1f248194738f4b19162575606 /chrome_frame | |
| parent | a8d1ebbe43f3de3c5aa44ebc1579f5352339f5eb (diff) | |
| download | chromium_src-995d592afc0fcee55a67b9f5ebcae7a093de6da0.zip chromium_src-995d592afc0fcee55a67b9f5ebcae7a093de6da0.tar.gz chromium_src-995d592afc0fcee55a67b9f5ebcae7a093de6da0.tar.bz2 | |
Fix ChromeFrame build by including necessary header and using the new namespace
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70361 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/mock_ie_event_sink_test.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h index 4b55f49..b40400d 100644 --- a/chrome_frame/test/mock_ie_event_sink_test.h +++ b/chrome_frame/test/mock_ie_event_sink_test.h @@ -14,6 +14,7 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "base/win/object_watcher.h" #include "chrome_frame/test/chrome_frame_test_utils.h" #include "chrome_frame/test/chrome_frame_ui_test_utils.h" #include "chrome_frame/test/ie_event_sink.h" @@ -206,9 +207,9 @@ class MockPropertyNotifySinkListener : public PropertyNotifySinkListener { }; // Allows tests to observe when processes exit. -class MockObjectWatcherDelegate : public base::ObjectWatcher::Delegate { +class MockObjectWatcherDelegate : public base::win::ObjectWatcher::Delegate { public: - // base::ObjectWatcher::Delegate implementation + // base::win::ObjectWatcher::Delegate implementation MOCK_METHOD1(OnObjectSignaled, void (HANDLE process_handle)); // NOLINT virtual ~MockObjectWatcherDelegate() { @@ -242,7 +243,7 @@ class MockObjectWatcherDelegate : public base::ObjectWatcher::Delegate { private: std::vector<HANDLE> process_handles_; - base::ObjectWatcher object_watcher_; + base::win::ObjectWatcher object_watcher_; }; // Mocks a window observer so that tests can detect new windows. |