Add support for gcf:about:plugins in chrome frame full tab mode. The URL validation code path

in ChromeFrame now takes in an interface NavigationConstraints which allows the delegateslike
the ActiveX, ActiveDocument and the NPAPI plugins to control the navigation decisions.

We no longer refer to the InternetSecurityManager interface which is IE only for performing
zone decisions in the ChromeFrame NPAPI plugin.

Fixes bug http://code.google.com/p/chromium/issues/detail?id=66118

BUG=66118
TEST=Covered by additional CanNavigate unit tests.

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

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

1 files changed, 6 insertions, 13 deletions

diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index c8a0938..0d7a4b9 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -27,6 +27,7 @@
 #include "chrome_frame/chrome_launcher_utils.h"
 #include "chrome_frame/crash_reporting/crash_metrics.h"
 #include "chrome_frame/custom_sync_call_context.h"
+#include "chrome_frame/navigation_constraints.h"
 #include "chrome_frame/simple_resource_loader.h"
 #include "chrome_frame/utils.h"
 
@@ -649,16 +650,6 @@ bool ChromeFrameAutomationClient::Initialize(
   init_state_ = INITIALIZING;
 
   HRESULT hr = S_OK;
-  // If chrome crashed and is being restarted, the security_manager_ object
-  // might already be valid.
-  if (security_manager_.get() == NULL)
-    hr = security_manager_.CreateInstance(CLSID_InternetSecurityManager);
-
-  if (FAILED(hr)) {
-    NOTREACHED() << __FUNCTION__
-                 << " Failed to create InternetSecurityManager. Error: 0x%x"
-                 << hr;
-  }
 
   if (chrome_launch_params_->url().is_valid())
     navigate_after_initialization_ = false;
@@ -715,8 +706,10 @@ void ChromeFrameAutomationClient::Uninitialize() {
   init_state_ = UNINITIALIZED;
 }
 
-bool ChromeFrameAutomationClient::InitiateNavigation(const std::string& url,
-    const std::string& referrer, bool is_privileged) {
+bool ChromeFrameAutomationClient::InitiateNavigation(
+    const std::string& url,
+    const std::string& referrer,
+    NavigationConstraints* navigation_constraints) {
   if (url.empty())
     return false;
 
@@ -724,7 +717,7 @@ bool ChromeFrameAutomationClient::InitiateNavigation(const std::string& url,
 
   // Catch invalid URLs early.
   // Can we allow this navigation to happen?
-  if (!CanNavigate(parsed_url, security_manager_, is_privileged)) {
+  if (!CanNavigate(parsed_url, navigation_constraints)) {
     DLOG(ERROR) << __FUNCTION__ << " Not allowing navigation to: " << url;
     return false;
   }