Merge ExecutionContextClient and ExecutionContext

Source/core/workers/WorkerConsole.cpp

 /*
  * Copyright (C) 2007 Apple Inc. All rights reserved.
  * Copyright (C) 2013 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.
@@ skipping 36 matching lines @@
 
 WorkerConsole::~WorkerConsole()
 {
 }
 
 void WorkerConsole::reportMessageToConsole(PassRefPtrWillBeRawPtr<ConsoleMessage> consoleMessage)
 {
     const ScriptCallFrame& lastCaller = consoleMessage->callStack()->at(0);
     consoleMessage->setURL(lastCaller.sourceURL());
     consoleMessage->setLineNumber(lastCaller.lineNumber());
-    m_scope->addMessage(consoleMessage);
+    m_scope->addConsoleMessage(consoleMessage);
 }
 
 ExecutionContext* WorkerConsole::context()
 {
     if (!m_scope)
         return 0;
     return m_scope->executionContext();
 }
 
 void WorkerConsole::trace(Visitor* visitor)
 {
     visitor->trace(m_scope);
     ConsoleBase::trace(visitor);
 }
 
 // FIXME: add memory getter
 
 } // namespace blink