Fixing a regression introduced with r69101, which now prevents Chrome Frame...

chrome_frame/chrome_frame_activex.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.
 
 #include "chrome_frame/chrome_frame_activex.h"
 
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 192 matching lines @@
 
 void ChromeFrameActivex::OnMessageFromChromeFrame(int tab_handle,
                                                   const std::string& message,
                                                   const std::string& origin,
                                                   const std::string& target) {
   DVLOG(1) << __FUNCTION__;
 
   if (target.compare("*") != 0) {
     bool drop = true;
 
-    if (is_privileged_) {
+    if (is_privileged()) {
       // Forward messages if the control is in privileged mode.
       ScopedComPtr<IDispatch> message_event;
       if (SUCCEEDED(CreateDomEvent("message", message, origin,
                                    message_event.Receive()))) {
         base::win::ScopedBstr target_bstr(UTF8ToWide(target).c_str());
         Fire_onprivatemessage(message_event, target_bstr);
 
         FireEvent(onprivatemessage_, message_event, target_bstr);
       }
     } else {
@@ skipping 41 matching lines @@
 
   NOTREACHED();
   return true;
 }
 
 void ChromeFrameActivex::OnAutomationServerLaunchFailed(
     AutomationLaunchResult reason, const std::string& server_version) {
   Base::OnAutomationServerLaunchFailed(reason, server_version);
 
   if (reason == AUTOMATION_VERSION_MISMATCH &&
-      ShouldShowVersionMismatchDialog(is_privileged_, m_spClientSite)) {
+      ShouldShowVersionMismatchDialog(is_privileged(), m_spClientSite)) {
     THREAD_SAFE_UMA_HISTOGRAM_COUNTS(
         "ChromeFrame.VersionMismatchDisplayed", 1);
     DisplayVersionMismatchWarning(m_hWnd, server_version);
   }
 }
 
 void ChromeFrameActivex::OnExtensionInstalled(
     const FilePath& path,
     void* user_data,
     AutomationMsg_ExtensionResponseValues response) {
@@ skipping 134 matching lines @@
       &onloaderror_,
       &onload_,
       &onreadystatechanged_,
       &onextensionready_,
     };
 
     for (int i = 0; i < arraysize(handlers); ++i)
       handlers[i]->clear();
 
     // Drop privileged mode on uninitialization.
-    is_privileged_ = false;
+    set_is_privileged(false);
   } else {
     ScopedComPtr<IHTMLDocument2> document;
     GetContainingDocument(document.Receive());
     if (document) {
       base::win::ScopedBstr url;
       if (SUCCEEDED(document->get_URL(url.Receive())))
         WideToUTF8(url, url.Length(), &document_url_);
     }
 
     // Probe to see whether the host implements the privileged service.
     ScopedComPtr<IChromeFramePrivileged> service;
     HRESULT service_hr = DoQueryService(SID_ChromeFramePrivileged,
                                         m_spClientSite,
                                         service.Receive());
     if (SUCCEEDED(service_hr) && service) {
       // Does the host want privileged mode?
       boolean wants_privileged = false;
       service_hr = service->GetWantsPrivileged(&wants_privileged);
 
       if (SUCCEEDED(service_hr) && wants_privileged)
-        is_privileged_ = true;
+        set_is_privileged(true);
 
-      url_fetcher_->set_privileged_mode(is_privileged_);
+      url_fetcher_->set_privileged_mode(is_privileged());
     }
 
     std::wstring profile_name(GetHostProcessName(false));
-    if (is_privileged_) {
+    if (is_privileged()) {
 
       base::win::ScopedBstr automated_functions_arg;
       service_hr = service->GetExtensionApisToAutomate(
           automated_functions_arg.Receive());
       if (S_OK == service_hr && automated_functions_arg) {
         std::string automated_functions(
             WideToASCII(static_cast<BSTR>(automated_functions_arg)));
         functions_enabled_.clear();
         // base::SplitString writes one empty entry for blank strings, so we
         // need this to allow specifying zero automation of API functions.
@@ skipping 16 matching lines @@
 
     // To avoid http://code.google.com/p/chromium/issues/detail?id=63427,
     // we always pass this flag needed by CEEE. It has no effect on
     // normal CF operation.
     //
     // Extra arguments are passed on verbatim, so we add the -- prefix.
     std::wstring chrome_extra_arguments(L"--");
     chrome_extra_arguments.append(
         ASCIIToWide(switches::kEnableExperimentalExtensionApis));
 
-    url_fetcher_->set_frame_busting(!is_privileged_);
+    url_fetcher_->set_frame_busting(!is_privileged());
     automation_client_->SetUrlFetcher(url_fetcher_.get());
     if (!InitializeAutomation(profile_name, chrome_extra_arguments,
                               IsIEInPrivate(), true, GURL(utf8_url),
                               GURL(), false)) {
       DLOG(ERROR) << "Failed to navigate to url:" << utf8_url;
       return E_FAIL;
     }
 
     // Log a metric that Chrome Frame is being used in Widget mode
     THREAD_SAFE_UMA_LAUNCH_TYPE_COUNT(RENDERER_TYPE_CHROME_WIDGET);
@@ skipping 182 matching lines @@
   if (FAILED(hr)) {
     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
                  << base::StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
                             base::win::ScopedVariant(bho));
   return S_OK;
 }