base: Remove stub scoped_variant_win.h file.

Fix the callers and add base::win in the call sites.

BUG=None
TEST=trybots

Review URL: http://codereview.chromium.org/5507001

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

6 files changed, 27 insertions, 30 deletions

diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.cc b/chrome_frame/test/chrome_frame_ui_test_utils.cc
index 0b65b36..69e9bf2 100644
--- a/chrome_frame/test/chrome_frame_ui_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_ui_test_utils.cc
@@ -60,7 +60,7 @@ AccObject* AccObject::CreateFromWindow(HWND hwnd) {
 AccObject* AccObject::CreateFromEvent(HWND hwnd, LONG object_id,
                                       LONG child_id) {
   ScopedComPtr<IAccessible> accessible;
-  ScopedVariant acc_child_id;
+  base::win::ScopedVariant acc_child_id;
   ::AccessibleObjectFromEvent(hwnd, object_id, child_id, accessible.Receive(),
                               acc_child_id.Receive());
   if (accessible && acc_child_id.type() == VT_I4)
@@ -82,7 +82,7 @@ AccObject* AccObject::CreateFromDispatch(IDispatch* dispatch) {
 // static
 AccObject* AccObject::CreateFromPoint(int x, int y) {
   ScopedComPtr<IAccessible> accessible;
-  ScopedVariant child_id;
+  base::win::ScopedVariant child_id;
   POINT point = {x, y};
   ::AccessibleObjectFromPoint(point, accessible.Receive(), child_id.Receive());
   if (accessible && child_id.type() == VT_I4)
@@ -119,7 +119,7 @@ bool AccObject::Focus() {
   // Double check that the object actually received focus. In some cases
   // the parent object must have the focus first.
   bool did_focus = false;
-  ScopedVariant focused;
+  base::win::ScopedVariant focused;
   if (SUCCEEDED(accessible_->get_accFocus(focused.Receive()))) {
     if (focused.type() != VT_EMPTY)
       did_focus = true;
@@ -136,7 +136,7 @@ bool AccObject::Select() {
 
   // Double check that the object actually received selection.
   bool did_select = false;
-  ScopedVariant selected;
+  base::win::ScopedVariant selected;
   if (SUCCEEDED(accessible_->get_accSelection(selected.Receive()))) {
     if (selected.type() != VT_EMPTY)
       did_select = true;
@@ -172,7 +172,7 @@ bool AccObject::GetName(std::wstring* name) {
 
 bool AccObject::GetRoleText(std::wstring* role_text) {
   DCHECK(role_text);
-  ScopedVariant role_variant;
+  base::win::ScopedVariant role_variant;
   if (SUCCEEDED(accessible_->get_accRole(child_id_, role_variant.Receive()))) {
     if (role_variant.type() == VT_I4) {
       wchar_t role_text_array[50];
@@ -207,7 +207,7 @@ bool AccObject::GetValue(std::wstring* value) {
 
 bool AccObject::GetState(int* state) {
   DCHECK(state);
-  ScopedVariant state_variant;
+  base::win::ScopedVariant state_variant;
   if (SUCCEEDED(accessible_->get_accState(child_id_,
                                           state_variant.Receive()))) {
     if (state_variant.type() == VT_I4) {
@@ -334,7 +334,7 @@ bool AccObject::GetFromNavigation(long navigation_type,
   bool is_child_navigation = navigation_type == NAVDIR_FIRSTCHILD ||
                              navigation_type == NAVDIR_LASTCHILD;
   DCHECK(!is_child_navigation || !IsSimpleElement());
-  ScopedVariant object_variant;
+  base::win::ScopedVariant object_variant;
   HRESULT result = accessible_->accNavigate(navigation_type,
                                             child_id_,
                                             object_variant.Receive());
diff --git a/chrome_frame/test/chrome_frame_ui_test_utils.h b/chrome_frame/test/chrome_frame_ui_test_utils.h
index 0b8c1f2..1f49395 100644
--- a/chrome_frame/test/chrome_frame_ui_test_utils.h
+++ b/chrome_frame/test/chrome_frame_ui_test_utils.h
@@ -12,7 +12,7 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_comptr_win.h"
-#include "base/scoped_variant_win.h"
+#include "base/win/scoped_variant.h"
 #include "chrome_frame/test/win_event_receiver.h"
 
 namespace gfx {
@@ -155,7 +155,7 @@ class AccObject : public base::RefCounted<AccObject> {
   bool PostMouseButtonMessages(int button_up, int button_down);
 
   ScopedComPtr<IAccessible> accessible_;
-  ScopedVariant child_id_;
+  base::win::ScopedVariant child_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AccObject);
 };
@@ -229,7 +229,7 @@ class AccEventObserver : public WinEventListener {
  private:
   class EventHandler : public base::RefCounted<EventHandler> {
    public:
-    EventHandler(AccEventObserver* observer);
+    explicit EventHandler(AccEventObserver* observer);
 
     // Examines the given event and invokes the corresponding method of its
     // observer.
diff --git a/chrome_frame/test/ie_event_sink.cc b/chrome_frame/test/ie_event_sink.cc
index a3c7ba0..d7bd7ef 100644
--- a/chrome_frame/test/ie_event_sink.cc
+++ b/chrome_frame/test/ie_event_sink.cc
@@ -14,7 +14,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::ScopedBstr;
-using base::win::ScopedVariant;
 
 namespace chrome_frame_test {
 
@@ -180,7 +179,7 @@ bool IEEventSink::IsCFRendering() {
 void IEEventSink::PostMessageToCF(const std::wstring& message,
                                   const std::wstring& target) {
   ScopedBstr message_bstr(message.c_str());
-  ScopedVariant target_variant(target.c_str());
+  base::win::ScopedVariant target_variant(target.c_str());
   EXPECT_HRESULT_SUCCEEDED(
       chrome_frame_->postMessage(message_bstr, target_variant));
 }
@@ -335,8 +334,8 @@ HRESULT IEEventSink::LaunchIEAndNavigate(
 }
 
 HRESULT IEEventSink::Navigate(const std::wstring& navigate_url) {
-  VARIANT empty = ScopedVariant::kEmptyVariant;
-  ScopedVariant url;
+  VARIANT empty = base::win::ScopedVariant::kEmptyVariant;
+  base::win::ScopedVariant url;
   url.Set(navigate_url.c_str());
 
   HRESULT hr = S_OK;
@@ -355,7 +354,7 @@ HRESULT IEEventSink::CloseWebBrowser() {
 }
 
 void IEEventSink::Refresh() {
-  ScopedVariant refresh_level(REFRESH_NORMAL);
+  base::win::ScopedVariant refresh_level(REFRESH_NORMAL);
   web_browser2_->Refresh2(refresh_level.AsInput());
 }
 
@@ -377,9 +376,9 @@ void IEEventSink::ConnectToChromeFrame() {
     }
 
     if (chrome_frame_) {
-      ScopedVariant onmessage(onmessage_.ToDispatch());
-      ScopedVariant onloaderror(onloaderror_.ToDispatch());
-      ScopedVariant onload(onload_.ToDispatch());
+      base::win::ScopedVariant onmessage(onmessage_.ToDispatch());
+      base::win::ScopedVariant onloaderror(onloaderror_.ToDispatch());
+      base::win::ScopedVariant onload(onload_.ToDispatch());
       EXPECT_HRESULT_SUCCEEDED(chrome_frame_->put_onmessage(onmessage));
       EXPECT_HRESULT_SUCCEEDED(chrome_frame_->put_onloaderror(onloaderror));
       EXPECT_HRESULT_SUCCEEDED(chrome_frame_->put_onload(onload));
@@ -394,7 +393,7 @@ void IEEventSink::DisconnectFromChromeFrame() {
     // pump running in the context of the outgoing call.
     ScopedComPtr<IChromeFrame> chrome_frame(chrome_frame_);
     chrome_frame_.Release();
-    ScopedVariant dummy(static_cast<IDispatch*>(NULL));
+    base::win::ScopedVariant dummy(static_cast<IDispatch*>(NULL));
     chrome_frame->put_onmessage(dummy);
     chrome_frame->put_onload(dummy);
     chrome_frame->put_onloaderror(dummy);
@@ -514,7 +513,7 @@ STDMETHODIMP_(void) IEEventSink::OnQuit() {
 
 HRESULT IEEventSink::OnLoad(const VARIANT* param) {
   DVLOG(1) << __FUNCTION__ << " " << param->bstrVal;
-  ScopedVariant stack_object(*param);
+  base::win::ScopedVariant stack_object(*param);
   if (chrome_frame_) {
     if (listener_)
       listener_->OnLoad(param->bstrVal);
@@ -542,7 +541,7 @@ HRESULT IEEventSink::OnMessage(const VARIANT* param) {
     return S_OK;
   }
 
-  ScopedVariant data, origin, source;
+  base::win::ScopedVariant data, origin, source;
   if (param && (V_VT(param) == VT_DISPATCH)) {
     wchar_t* properties[] = { L"data", L"origin", L"source" };
     const int prop_count = arraysize(properties);
diff --git a/chrome_frame/test/mock_ie_event_sink_test.cc b/chrome_frame/test/mock_ie_event_sink_test.cc
index c591744..2f48ffa 100644
--- a/chrome_frame/test/mock_ie_event_sink_test.cc
+++ b/chrome_frame/test/mock_ie_event_sink_test.cc
@@ -6,7 +6,7 @@
 
 #include <sstream>
 
-#include "base/scoped_variant_win.h"
+#include "base/win/scoped_variant.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/test/mock_ie_event_sink_actions.h"
 
@@ -160,7 +160,7 @@ void MockIEEventSink::ExpectDocumentReadystate(int ready_state) {
     EXPECT_TRUE(document != NULL);
     if (document) {
       DISPPARAMS params = { 0 };
-      ScopedVariant result;
+      base::win::ScopedVariant result;
       EXPECT_HRESULT_SUCCEEDED(document->Invoke(DISPID_READYSTATE, IID_NULL,
           LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &params,
           result.Receive(), NULL, NULL));
@@ -214,4 +214,3 @@ std::wstring MockIEEventSinkTest::GetTestUrl(
 }
 
 }  // namespace chrome_frame_test
-
diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc
index adc00ef..1690e01 100644
--- a/chrome_frame/test/ui_test.cc
+++ b/chrome_frame/test/ui_test.cc
@@ -269,7 +269,7 @@ TEST_P(FullTabUITest, ViewSource) {
   InSequence expect_in_sequence_for_scope;
 
   // After navigation invoke view soruce action using IWebBrowser2::ExecWB
-  VARIANT empty = ScopedVariant::kEmptyVariant;
+  VARIANT empty = base::win::ScopedVariant::kEmptyVariant;
   EXPECT_CALL(ie_mock_, OnLoad(in_cf,
                                StrEq(GetSimplePageUrl())))
       .WillOnce(DelayExecCommand(&ie_mock_, &loop_, 0, &CGID_MSHTML,
@@ -309,7 +309,7 @@ void NavigateToCurrentUrl(MockIEEventSink* mock) {
   EXPECT_HRESULT_SUCCEEDED(hr);
   if (SUCCEEDED(hr)) {
     DCHECK(bstr.Length());
-    VARIANT empty = ScopedVariant::kEmptyVariant;
+    VARIANT empty = base::win::ScopedVariant::kEmptyVariant;
     hr = browser->Navigate(bstr, &empty, &empty, &empty, &empty);
     EXPECT_HRESULT_SUCCEEDED(hr);
   }
@@ -365,7 +365,7 @@ TEST_P(FullTabUITest, TabCrashRefresh) {
           ConnectDocPropNotifySink(&ie_mock_, &prop_listener),
           KillChromeFrameProcesses()));
 
-  VARIANT empty = ScopedVariant::kEmptyVariant;
+  VARIANT empty = base::win::ScopedVariant::kEmptyVariant;
   EXPECT_CALL(prop_listener, OnChanged(/*DISPID_READYSTATE*/_))
       .WillOnce(DoAll(
           DisconnectDocPropNotifySink(&prop_listener),
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 8fd90fc..e4279a7 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -41,7 +41,6 @@
 
 using base::win::RegKey;
 using base::win::ScopedComPtr;
-using base::win::ScopedVariant;
 
 // Note that these values are all lower case and are compared to
 // lower-case-transformed values.
@@ -825,7 +824,7 @@ HRESULT NavigateBrowserToMoniker(IUnknown* browser, IMoniker* moniker,
   ScopedComPtr<IUriContainer> uri_container;
   hr = uri_container.QueryFrom(moniker);
 
-  ScopedVariant headers_var;
+  base::win::ScopedVariant headers_var;
   if (headers && headers[0])
     headers_var.Set(headers);
 
@@ -880,7 +879,7 @@ HRESULT NavigateBrowserToMoniker(IUnknown* browser, IMoniker* moniker,
           fragment = NULL;
         }
 
-        ScopedVariant var_url(UTF8ToWide(target_url.spec()).c_str());
+        base::win::ScopedVariant var_url(UTF8ToWide(target_url.spec()).c_str());
         hr = browser_priv->NavigateWithBindCtx(var_url.AsInput(), NULL, NULL,
                                                NULL, headers_var.AsInput(),
                                                bind_ctx,