Merge 68951 - Added refreshing of elevation policy on first run of new versio...

ceee/ie/broker/broker_module.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.
 //
 // Declaration of ATL module object for EXE module.
 
 #include <atlbase.h>
 #include <atlhost.h>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
+#include "ceee/common/com_utils.h"
 #include "ceee/ie/broker/broker.h"
 #include "ceee/ie/broker/broker_rpc_server.h"
 #include "ceee/ie/broker/chrome_postman.h"
 #include "ceee/ie/broker/executors_manager.h"
 #include "ceee/ie/broker/resource.h"
 #include "ceee/ie/broker/window_events_funnel.h"
+#include "ceee/ie/common/ceee_module_util.h"
+#include "ceee/ie/common/crash_reporter.h"
 #include "ceee/ie/plugin/toolband/toolband_proxy.h"
-#include "ceee/ie/common/crash_reporter.h"
-#include "ceee/common/com_utils.h"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/metrics_service.h"
 
 namespace {
 
 const wchar_t kLogFileName[] = L"CeeeBroker.log";
 
 // {6E3D6168-1DD2-4edb-A183-584C2C66E96D}
 const GUID kCeeeBrokerLogProviderName =
     { 0x6e3d6168, 0x1dd2, 0x4edb,
@@ skipping 173 matching lines @@
   chrome_postman_.Term();
 }
 
 CeeeBrokerModule::~CeeeBrokerModule() {
   crash_reporter_.ShutdownCrashReporting();
   logging::CloseLogFile();
   TRACE_EVENT_END("ceee.broker", this, "");
 }
 
 HRESULT WINAPI CeeeBrokerModule::UpdateRegistryAppId(BOOL reg) throw() {
-  return com::ModuleRegistrationWithoutAppid(IDR_BROKER_MODULE, reg);
+  HRESULT hr = com::ModuleRegistrationWithoutAppid(IDR_BROKER_MODULE, reg);
+  if (SUCCEEDED(hr)) {
+    ceee_module_util::RefreshElevationPolicyIfNeeded();
+  }
+  return hr;
 }
 
 namespace ceee_module_util {
 
 LONG LockModule() {
   return module.LockModule();
 }
 
 LONG UnlockModule() {
   return module.UnlockModule();
 }
 
 }  // namespace