Revert the merge. Mac build is mysteriously broken.

third_party/WebKit/WebCore/page/SecurityOrigin.cpp

 /*
  * Copyright (C) 2007 Apple Inc. 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 251 matching lines @@
     int port = databaseIdentifier.right(databaseIdentifier.length() - separator2 - 1).toInt(&portOkay);
     if (!portOkay && separator2 + 1 == static_cast<int>(databaseIdentifier.length()))
         return create(KURL());
     
     if (port < 0 || port > 65535)
         return create(KURL());
         
     // Split out the 3 sections of data
     String protocol = databaseIdentifier.substring(0, separator1);
     String host = databaseIdentifier.substring(separator1 + 1, separator2 - separator1 - 1);
-    return create(KURL(KURL(), protocol + "://" + host + ":" + String::number(port)));
+    return create(KURL(protocol + "://" + host + ":" + String::number(port)));
 }
 
 String SecurityOrigin::databaseIdentifier() const 
 {
     DEFINE_STATIC_LOCAL(String, separatorString, (&SeparatorCharacter, 1));
     return m_protocol + separatorString + m_host + separatorString + String::number(m_port); 
 }
 
 bool SecurityOrigin::equal(const SecurityOrigin* other) const 
 {
@@ skipping 18 matching lines @@
         return false;
 
     if (m_port != other->m_port)
         return false;
 
     return true;
 }
 
 } // namespace WebCore