From 095ffd023f6b2abd44c896fdf77b75f9ad798a6a Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Thu, 17 Jan 2013 21:28:53 +0000
Subject: [PATCH] Merge revision 1015 changes: - Allow empty |browser|
 parameter to CefSchemeHandlerFactory::Create (issue #834).

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1364@1016 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/include/cef_scheme.h                               | 2 +-
 cef1/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc | 5 +----
 cef1/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc | 5 +----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cef1/include/cef_scheme.h b/cef1/include/cef_scheme.h
index 1bd9a39b2..e4055456a 100644
--- a/cef1/include/cef_scheme.h
+++ b/cef1/include/cef_scheme.h
@@ -135,7 +135,7 @@ class CefSchemeHandlerFactory : public virtual CefBase {
   // initiated using the CefWebURLRequest API |browser| will be NULL. The
   // |request| object passed to this method will not contain cookie data.
   ///
-  /*--cef()--*/
+  /*--cef(optional_param=browser)--*/
   virtual CefRefPtr<CefSchemeHandler> Create(CefRefPtr<CefBrowser> browser,
                                              const CefString& scheme_name,
                                              CefRefPtr<CefRequest> request) =0;
diff --git a/cef1/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc b/cef1/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc
index 2459b0ccb..e810ab613 100644
--- a/cef1/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc
+++ b/cef1/libcef_dll/cpptoc/scheme_handler_factory_cpptoc.cc
@@ -26,10 +26,6 @@ struct _cef_scheme_handler_t* CEF_CALLBACK scheme_handler_factory_create(
   DCHECK(self);
   if (!self)
     return NULL;
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser);
-  if (!browser)
-    return NULL;
   // Verify param: scheme_name; type: string_byref_const
   DCHECK(scheme_name);
   if (!scheme_name)
@@ -38,6 +34,7 @@ struct _cef_scheme_handler_t* CEF_CALLBACK scheme_handler_factory_create(
   DCHECK(request);
   if (!request)
     return NULL;
+  // Unverified params: browser
 
   // Execute
   CefRefPtr<CefSchemeHandler> _retval = CefSchemeHandlerFactoryCppToC::Get(
diff --git a/cef1/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc b/cef1/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc
index cb269c482..60d1ab1b8 100644
--- a/cef1/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc
+++ b/cef1/libcef_dll/ctocpp/scheme_handler_factory_ctocpp.cc
@@ -26,10 +26,6 @@ CefRefPtr<CefSchemeHandler> CefSchemeHandlerFactoryCToCpp::Create(
 
   // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
 
-  // Verify param: browser; type: refptr_diff
-  DCHECK(browser.get());
-  if (!browser.get())
-    return NULL;
   // Verify param: scheme_name; type: string_byref_const
   DCHECK(!scheme_name.empty());
   if (scheme_name.empty())
@@ -38,6 +34,7 @@ CefRefPtr<CefSchemeHandler> CefSchemeHandlerFactoryCToCpp::Create(
   DCHECK(request.get());
   if (!request.get())
     return NULL;
+  // Unverified params: browser
 
   // Execute
   cef_scheme_handler_t* _retval = struct_->create(struct_,