Call isValidProtocol() function first in order to remove duplicated protocol checking in NavigatorC…

Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp

 /*
  * Copyright (C) 2011, Google Inc. All rights reserved.
  * Copyright (C) 2014, Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 91 matching lines @@
     StringBuilder builder;
     unsigned length = scheme.length();
     for (unsigned i = 0; i < length; ++i)
         builder.append(toASCIILower(scheme[i]));
 
     return protocolWhitelist->contains(builder.toString());
 }
 
 static bool verifyProtocolHandlerScheme(const String& scheme, const String& method, ExceptionState& exceptionState)
 {
-    if (scheme.startsWith("web+")) {
-        // The specification requires that the length of scheme is at least five characteres (including 'web+' prefix).
-        if (scheme.length() >= 5 && isValidProtocol(scheme))
-            return true;
-        if (!isValidProtocol(scheme))
-            exceptionState.throwSecurityError("The scheme '" + scheme + "' is not a valid protocol.");
-        else
-            exceptionState.throwSecurityError("The scheme '" + scheme + "' is less than five characters long.");
+    if (!isValidProtocol(scheme)) {
+        exceptionState.throwSecurityError("The scheme '" + scheme + "' is not valid protocol");
         return false;
     }
 
-    // The specification requires that schemes don't contain colons.
-    size_t index = scheme.find(':');
-    if (index != kNotFound) {
-        exceptionState.throwDOMException(SyntaxError, "The scheme '" + scheme + "' contains colon.");
+    if (scheme.startsWith("web+")) {
+        // The specification requires that the length of scheme is at least five characteres (including 'web+' prefix).
+        if (scheme.length() >= 5)
+            return true;
+
+        exceptionState.throwSecurityError("The scheme '" + scheme + "' is less than five characters long.");
         return false;
     }
 
     if (isProtocolWhitelisted(scheme))
         return true;
+
     exceptionState.throwSecurityError("The scheme '" + scheme + "' doesn't belong to the protocol whitelist. Please prefix non-whitelisted schemes with the string 'web+'.");
     return false;
 }
 
 NavigatorContentUtils* NavigatorContentUtils::from(Page& page)
 {
     return static_cast<NavigatorContentUtils*>(WillBeHeapSupplement<Page>::from(page, supplementName()));
 }
 
 NavigatorContentUtils::~NavigatorContentUtils()
@@ skipping 88 matching lines @@
 {
     return "NavigatorContentUtils";
 }
 
 void provideNavigatorContentUtilsTo(Page& page, PassOwnPtr<NavigatorContentUtilsClient> client)
 {
     NavigatorContentUtils::provideTo(page, NavigatorContentUtils::supplementName(), NavigatorContentUtils::create(client));
 }
 
 } // namespace WebCore