Merge updateSecurityOrigin() and setSecurityOrigin().

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
  * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
@@ skipping 4998 matching lines @@
     LocalFrame* frame = executingFrame();
     if (!frame)
         return false;
     if (!node->document().executingFrame())
         return false;
     if (!frame->script().canExecuteScripts(AboutToExecuteScript))
         return false;
     return true;
 }
 
-void Document::updateSecurityOrigin(PassRefPtr<SecurityOrigin> origin)
-{
-    setSecurityOrigin(origin);
-    didUpdateSecurityOrigin();
-}
-
 void Document::didUpdateSecurityOrigin()
 {
     if (!m_frame)
         return;
     m_frame->updateSecurityOrigin(securityOrigin());
 }
 
 bool Document::isContextThread() const
 {
     return isMainThread();
@@ skipping 908 matching lines @@
 #ifndef NDEBUG
 using namespace blink;
 void showLiveDocumentInstances()
 {
     Document::WeakDocumentSet& set = Document::liveDocumentSet();
     fprintf(stderr, "There are %u documents currently alive:\n", set.size());
     for (Document* document : set)
         fprintf(stderr, "- Document %p URL: %s\n", document, document->url().string().utf8().data());
 }
 #endif