Merge updateSecurityOrigin() and setSecurityOrigin().

third_party/WebKit/Source/core/dom/SecurityContext.cpp

 /*
  * Copyright (C) 2011 Google 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 35 matching lines @@
 
 DEFINE_TRACE(SecurityContext)
 {
     visitor->trace(m_contentSecurityPolicy);
 }
 
 void SecurityContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securityOrigin)
 {
     m_securityOrigin = securityOrigin;
     m_haveInitializedSecurityOrigin = true;
+    didUpdateSecurityOrigin();
 }
 
 void SecurityContext::setContentSecurityPolicy(PassRefPtrWillBeRawPtr<ContentSecurityPolicy> contentSecurityPolicy)
 {
     m_contentSecurityPolicy = contentSecurityPolicy;
 }
 
 bool SecurityContext::isSecureTransitionTo(const KURL& url) const
 {
     // If we haven't initialized our security origin by now, this is probably
@@ skipping 10 matching lines @@
 {
     m_sandboxFlags |= mask;
 
     if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isUnique()) {
         setSecurityOrigin(SecurityOrigin::createUnique());
         didUpdateSecurityOrigin();
     }
 }
 
 } // namespace blink