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, 13 insertions, 1 deletions

diff --git a/chrome_frame/navigation_constraints.h b/chrome_frame/navigation_constraints.h
index a66cdeb..fe24558 100644
--- a/chrome_frame/navigation_constraints.h
+++ b/chrome_frame/navigation_constraints.h
@@ -23,15 +23,27 @@ class NavigationConstraints {
 // Provides default implementation for the NavigationConstraints interface.
 class NavigationConstraintsImpl : public NavigationConstraints {
  public:
+  NavigationConstraintsImpl();
   virtual ~NavigationConstraintsImpl() {}
 
   // NavigationConstraints method overrides.
   virtual bool AllowUnsafeUrls();
   virtual bool IsSchemeAllowed(const GURL& url);
   virtual bool IsZoneAllowed(const GURL& url);
+
+  bool is_privileged() const;
+  void set_is_privileged(bool is_privileged);
+
  private:
   base::win::ScopedComPtr<IInternetSecurityManager> security_manager_;
+
+  // The plugin is privileged if it is:
+  // * Invoked by a window running under the system principal in FireFox.
+  // * Being hosted by a custom host exposing the SID_ChromeFramePrivileged
+  //   service.
+  //
+  // When privileged, additional interfaces are made available to the user.
+  bool is_privileged_;
 };
 
 #endif  // CHROME_FRAME_NAVIGATION_CONSTRAINTS_H_
-