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

from loading chrome extension URL in privileged mode using the NPAPI plugin.
The behaviour that was implemented only for the ActiveX control has been
moved into the base class NavigationConstraintsImpl, which both the ActieX
and NPAPI plugin derive from.

TEST=Added new unit tests for this case
BUG=0

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

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

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc
index 286f351..fe3a36a 100644
--- a/chrome_frame/chrome_frame_activex.cc
+++ b/chrome_frame/chrome_frame_activex.cc
@@ -210,7 +210,7 @@ void ChromeFrameActivex::OnMessageFromChromeFrame(int tab_handle,
   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,
@@ -272,7 +272,7 @@ void ChromeFrameActivex::OnAutomationServerLaunchFailed(
   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);
@@ -427,7 +427,7 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite(
       handlers[i]->clear();
 
     // Drop privileged mode on uninitialization.
-    is_privileged_ = false;
+    set_is_privileged(false);
   } else {
     ScopedComPtr<IHTMLDocument2> document;
     GetContainingDocument(document.Receive());
@@ -448,13 +448,13 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite(
       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(
@@ -491,7 +491,7 @@ HRESULT ChromeFrameActivex::IOleObject_SetClientSite(
     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),