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

chrome_frame/chrome_frame_automation.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_automation.h"
 
 #include "app/app_switches.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 636 matching lines @@
 
   // Keep object in memory, while the window is alive.
   // Corresponding Release is in OnFinalMessage();
   AddRef();
 
   // Mark our state as initializing.  We'll reach initialized once
   // InitializeComplete is called successfully.
   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;
 
   proxy_factory_->GetAutomationServer(static_cast<LaunchDelegate*>(this),
       chrome_launch_params_, &automation_server_id_);
 
   return true;
 }
 
@@ skipping 36 matching lines @@
   if (::IsWindow(m_hWnd))
     DestroyWindow();
 
   // DCHECK(navigate_after_initialization_ == false);
   handle_top_level_requests_ = false;
   ui_thread_id_ = 0;
   chrome_frame_delegate_ = NULL;
   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;
 
   GURL parsed_url(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;
   }
 
   // If we are not yet initialized ignore attempts to navigate to the same url.
   // Navigation attempts to the same URL could occur if the automation client
   // was reused for a new active document instance.
   if (!chrome_launch_params_ || is_initialized() ||
       parsed_url != chrome_launch_params_->url()) {
     // Important: Since we will be using the referrer_ variable from a
@@ skipping 726 matching lines @@
     const URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(0, tab_->handle(),
       request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(0,
       tab_->handle(), success, url, cookie_string, cookie_id));
 }