Added refreshing of elevation policy on first run of new version for all user...

ceee/ie/broker/broker_rpc_client.cc

 // Copyright (c) 2010 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.
 //
 // Broker RPC Client implementation.
 
 #include "ceee/ie/broker/broker_rpc_client.h"
 
 #include <atlbase.h>

[Jói, 2010/12/11 02:23:14]

I think we normally put one blank line after all the system headers.

[Vitaly Buka (NO REVIEWS), 2010/12/11 08:26:24]

Done.

 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/tuple.h"
 #include "base/win/scoped_comptr.h"
 #include "broker_lib.h"  // NOLINT

[Jói, 2010/12/11 02:23:14]

our convention has been to put pathless includes like these two at the bottom of
the include list with a blank line before them (i.e. as a separate section)

[Vitaly Buka (NO REVIEWS), 2010/12/11 08:26:24]

Done.

 #include "broker_rpc_lib.h"  // NOLINT
 #include "ceee/common/com_utils.h"
 #include "ceee/ie/broker/broker_rpc_utils.h"
+#include "ceee/ie/common/ceee_module_util.h"
 
 
 namespace {
 
 // Avoid using objects requiring unwind in functions that use __try.
 void LogRpcException(const char* str, unsigned int exception_code) {
   LOG(ERROR) << str << com::LogWe(exception_code);
 }
 
 // Avoid using objects requiring unwind in functions that use __try.
@@ skipping 80 matching lines @@
 }
 
 void BrokerRpcClient::ReleaseContext() {
   RpcTryExcept {
     BrokerRpcClient_Disconnect(binding_handle_, &context_);
   } RpcExcept(HandleRpcException(RpcExceptionCode())) {
     LogRpcException("RPC error in ReleaseContext", RpcExceptionCode());
   } RpcEndExcept
 }
 
-HRESULT BrokerRpcClient::StartServer(IUnknown** server) {
-  base::win::ScopedComPtr<IUnknown> broker;
-  // TODO(vitalybuka@google.com): Start broker without COM after the last
-  // COM interface is removed.
-  HRESULT hr = broker.CreateInstance(CLSID_CeeeBroker);
-  LOG_IF(ERROR, FAILED(hr)) << "Failed to create broker. " << com::LogHr(hr);
-  if (FAILED(hr))
-    return hr;
-  *server = broker.Detach();
-  return S_OK;
+HRESULT BrokerRpcClient::StartServer(ICeeeBrokerRegistrar** server) {
+  return StartCeeeBroker(server);
 }
 
 HRESULT BrokerRpcClient::Connect(bool start_server) {
   if (is_connected())
     return S_OK;
 
   // Keep alive until RPC is connected.
-  base::win::ScopedComPtr<IUnknown> broker;
+  base::win::ScopedComPtr<ICeeeBrokerRegistrar> broker;
   if (start_server) {
     HRESULT hr = StartServer(broker.Receive());
     if (FAILED(hr))
       return hr;
   }
 
   if (SUCCEEDED(BindRpc(GetRpcEndpointAddress(), &binding_handle_)))
     LockContext();
 
   if (!is_connected()) {
@@ skipping 58 matching lines @@
 HRESULT BrokerRpcClient::SendUmaHistogramData(const char* name,
                                               int sample,
                                               int min,
                                               int max,
                                               int bucket_count) {
   return RunRpc(allow_restarts_,
                 &BrokerRpcClient_SendUmaHistogramData,
                 MakeRefTuple(binding_handle_, name, sample, min, max,
                           bucket_count));
 }
+
+HRESULT StartCeeeBroker(ICeeeBrokerRegistrar** broker) {
+  ceee_module_util::RefreshElevationPolicyIfNeeded();
+  base::win::ScopedComPtr<ICeeeBrokerRegistrar> broker_tmp;
+  // TODO(vitalybuka@google.com): Start broker without COM after the last
+  // COM interface is removed.
+  HRESULT hr = broker_tmp.CreateInstance(CLSID_CeeeBroker);
+  LOG_IF(ERROR, FAILED(hr)) << "Failed to create broker. " << com::LogHr(hr);

[Jói, 2010/12/11 02:23:14]

nit: suggest moving inside the if (FAILED(hr)) conditional (adding braces, and
changing to LOG(ERROR)) so that you don't have to repeat the condition, less
chance of errors in maintenance that way.

[Vitaly Buka (NO REVIEWS), 2010/12/11 08:26:24]

Done.

+  if (FAILED(hr))
+    return hr;
+  *broker = broker_tmp.Detach();
+  return S_OK;
+}