summaryrefslogtreecommitdiffstats
path: root/chrome_frame/protocol_sink_wrap.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/protocol_sink_wrap.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/protocol_sink_wrap.cc')
-rw-r--r--chrome_frame/protocol_sink_wrap.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/protocol_sink_wrap.cc b/chrome_frame/protocol_sink_wrap.cc
index 5d9d42f..7e3a760 100644
--- a/chrome_frame/protocol_sink_wrap.cc
+++ b/chrome_frame/protocol_sink_wrap.cc
@@ -8,11 +8,11 @@
#include "chrome_frame/protocol_sink_wrap.h"
#include "base/logging.h"
-#include "base/scoped_bstr_win.h"
#include "base/singleton.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/utf_string_conversions.h"
+#include "base/win/scoped_bstr.h"
#include "chrome_frame/bho.h"
#include "chrome_frame/bind_context_info.h"
#include "chrome_frame/exception_barrier.h"
@@ -748,7 +748,7 @@ STDMETHODIMP Hook_StartEx(InternetProtocol_StartEx_Fn orig_start_ex,
if (!uri || !prot_sink || !bind_info)
return E_INVALIDARG;
- ScopedBstr url;
+ base::win::ScopedBstr url;
uri->GetPropertyBSTR(Uri_PROPERTY_ABSOLUTE_URI, url.Receive(), 0);
DLOG_IF(INFO, url != NULL) << "OnStartEx: " << url << PiFlags2Str(flags);