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

chrome_frame/chrome_frame_npapi.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_npapi.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/ff_privilege_check.h"
 #include "chrome_frame/np_utils.h"
 #include "chrome_frame/scoped_ns_ptr_win.h"
 #include "chrome_frame/utils.h"
 
 MessageLoop* ChromeFrameNPAPI::message_loop_ = NULL;
 int ChromeFrameNPAPI::instance_count_ = 0;
 
 static const char* kNpEventNames[] = {
@@ skipping 387 matching lines @@
   print_bounds.left = window.x;
   print_bounds.top = window.y;
   print_bounds.right = window.x + window.width;
   print_bounds.bottom = window.x + window.height;
 
   automation_client_->Print(
       reinterpret_cast<HDC>(print_info->print.embedPrint.platformPrint),
       print_bounds);
 }
 
+bool ChromeFrameNPAPI::IsSchemeAllowed(const GURL& url) {

[amit, 2010/12/14 19:37:58]

This looks identical to the ActiveX version. So maybe move this down to the base
class and have a dcheck(!is_privileged_) in the ActiveDoc::IsSchemeAllowed(...)
for now?

+  bool allowed = NavigationConstraintsImpl::IsSchemeAllowed(url);
+  if (allowed)
+    return true;
+
+  if (is_privileged_ &&
+      (url.SchemeIs(chrome::kDataScheme) ||
+       url.SchemeIs(chrome::kExtensionScheme))) {
+    return true;
+  }
+  return false;
+}
+
 void ChromeFrameNPAPI::UrlNotify(const char* url, NPReason reason,
                                  void* notify_data) {
   if (enabled_popups_) {
     // We have opened the URL so tell the browser to restore popup settings
     enabled_popups_ = false;
     npapi::PopPopupsEnabledState(instance_);
   }
 
   url_fetcher_.UrlNotify(url, reason, notify_data);
 }
@@ skipping 1074 matching lines @@
 }
 
 int32 ChromeFrameNPAPI::Write(NPStream* stream, int32 offset, int32 len,
                               void* buffer) {
   return url_fetcher_.Write(stream, offset, len, buffer);
 }
 
 NPError ChromeFrameNPAPI::DestroyStream(NPStream* stream, NPReason reason) {
   return url_fetcher_.DestroyStream(stream, reason);
 }