blink: Rename modules/ method to prefix with get when they collide.

third_party/WebKit/Source/modules/mediastream/MediaStream.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011, 2012 Ericsson AB. 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 294 matching lines @@
 {
     ContextLifecycleObserver::contextDestroyed();
     m_stopped = true;
 }
 
 const AtomicString& MediaStream::interfaceName() const
 {
     return EventTargetNames::MediaStream;
 }
 
-ExecutionContext* MediaStream::executionContext() const
+ExecutionContext* MediaStream::getExecutionContext() const
 {
-    return ContextLifecycleObserver::executionContext();
+    return ContextLifecycleObserver::getExecutionContext();
 }
 
 void MediaStream::addRemoteTrack(MediaStreamComponent* component)
 {
     ASSERT(component);
     if (m_stopped)
         return;
 
-    MediaStreamTrack* track = MediaStreamTrack::create(executionContext(), component);
+    MediaStreamTrack* track = MediaStreamTrack::create(getExecutionContext(), component);
     switch (component->source()->type()) {
     case MediaStreamSource::TypeAudio:
         m_audioTracks.append(track);
         break;
     case MediaStreamSource::TypeVideo:
         m_videoTracks.append(track);
         break;
     }
     track->registerMediaStream(this);
     m_descriptor->addComponent(component);
@@ skipping 78 matching lines @@
     visitor->trace(m_audioTracks);
     visitor->trace(m_videoTracks);
     visitor->trace(m_descriptor);
     visitor->trace(m_scheduledEvents);
     RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>::trace(visitor);
     ContextLifecycleObserver::trace(visitor);
     MediaStreamDescriptorClient::trace(visitor);
 }
 
 } // namespace blink