summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/ie_event_sink.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 15:50:30 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 15:50:30 +0000
commit965722ff0e981ac0775648460be766c829a10a2b (patch)
tree7d8cd2362a1f216eb64aca9ffaefa3d0774e58dd /chrome_frame/test/ie_event_sink.cc
parent41a95c41d16de968f5d1b02f1ffcccc287147825 (diff)
downloadchromium_src-965722ff0e981ac0775648460be766c829a10a2b.zip
chromium_src-965722ff0e981ac0775648460be766c829a10a2b.tar.gz
chromium_src-965722ff0e981ac0775648460be766c829a10a2b.tar.bz2
Remove scoped_bstr_win, fix all callers to use the new location.
TEST=it compiles BUG=none Review URL: http://codereview.chromium.org/3748012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63216 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/ie_event_sink.cc')
-rw-r--r--chrome_frame/test/ie_event_sink.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index 50d33b5..a3c7ba0 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -4,15 +4,18 @@
#include "chrome_frame/test/ie_event_sink.h"
-#include "base/scoped_bstr_win.h"
#include "base/scoped_handle.h"
-#include "base/scoped_variant_win.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
+#include "base/win/scoped_bstr.h"
+#include "base/win/scoped_variant.h"
#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
+using base::win::ScopedBstr;
+using base::win::ScopedVariant;
+
namespace chrome_frame_test {
const int kDefaultWaitForIEToTerminateMs = 10 * 1000;