base: Remove operator& from ScopedVariant and ScopedPropVariant.

win8/metro_driver/ime/text_service.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "win8/metro_driver/ime/text_service.h"
 
 #include <msctf.h>
 
 #include "base/logging.h"
 #include "base/win/scoped_variant.h"
@@ skipping 93 matching lines @@
   hr = thread_compartment_manager->GetCompartment(
       GUID_COMPARTMENT_KEYBOARD_INPUTMODE_SENTENCE,
       sentence_compartment.Receive());
   if (FAILED(hr)) {
     LOG(ERROR) << "ITfCompartment::GetCompartment failed. hr = " << hr;
     return false;
   }
 
   base::win::ScopedVariant sentence_variant;
   sentence_variant.Set(TF_SENTENCEMODE_PHRASEPREDICT);
-  hr = sentence_compartment->SetValue(client_id, &sentence_variant);
+  hr = sentence_compartment->SetValue(client_id, sentence_variant.ptr());
   if (FAILED(hr)) {
     LOG(ERROR) << "ITfCompartment::SetValue failed. hr = " << hr;
     return false;
   }
   return true;
 }
 
 // Initializes |context| as disabled context where IMEs will be disabled.
 bool InitializeDisabledContext(ITfContext* context, TfClientId client_id) {
   base::win::ScopedComPtr<ITfCompartmentMgr> compartment_mgr;
   HRESULT hr = compartment_mgr.QueryFrom(context);
   if (FAILED(hr)) {
     LOG(ERROR) << "QueryFrom failed. hr = " << hr;
     return false;
   }
 
   base::win::ScopedComPtr<ITfCompartment> disabled_compartment;
   hr = compartment_mgr->GetCompartment(GUID_COMPARTMENT_KEYBOARD_DISABLED,
                                        disabled_compartment.Receive());
   if (FAILED(hr)) {
     LOG(ERROR) << "ITfCompartment::GetCompartment failed. hr = " << hr;
     return false;
   }
 
   base::win::ScopedVariant variant;
   variant.Set(1);
-  hr = disabled_compartment->SetValue(client_id, &variant);
+  hr = disabled_compartment->SetValue(client_id, variant.ptr());
   if (FAILED(hr)) {
     LOG(ERROR) << "ITfCompartment::SetValue failed. hr = " << hr;
     return false;
   }
 
   base::win::ScopedComPtr<ITfCompartment> empty_context;
   hr = compartment_mgr->GetCompartment(GUID_COMPARTMENT_EMPTYCONTEXT,
                                        empty_context.Receive());
   if (FAILED(hr)) {
     LOG(ERROR) << "ITfCompartment::GetCompartment failed. hr = " << hr;
     return false;
   }
 
   base::win::ScopedVariant empty_context_variant;
   empty_context_variant.Set(static_cast<int32>(1));
-  hr = empty_context->SetValue(client_id, &empty_context_variant);
+  hr = empty_context->SetValue(client_id, empty_context_variant.ptr());
   if (FAILED(hr)) {
     LOG(ERROR) << "ITfCompartment::SetValue failed. hr = " << hr;
     return false;
   }
 
   return true;
 }
 
 bool IsPasswordField(const std::vector<InputScope>& input_scopes) {
   return std::find(input_scopes.begin(), input_scopes.end(), IS_PASSWORD) !=
@@ skipping 312 matching lines @@
   if (!InitializeSentenceMode(thread_manager.get(), client_id)) {
     LOG(ERROR) << "InitializeSentenceMode failed.";
     thread_manager->Deactivate();
     return scoped_ptr<TextService>();
   }
   return scoped_ptr<TextService>(new TextServiceImpl(
       thread_manager.get(), client_id, window_handle, delegate));
 }
 
 }  // namespace metro_driver