Use __func__ instead of __FUNCTION__.

media/filters/media_source_state.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/media_source_state.h"
 
 #include "base/callback_helpers.h"
 #include "base/stl_util.h"
 #include "media/base/media_track.h"
 #include "media/base/media_tracks.h"
@@ skipping 152 matching lines @@
   DCHECK(!timestamp_offset_during_append_);
   append_window_start_during_append_ = append_window_start;
   append_window_end_during_append_ = append_window_end;
   timestamp_offset_during_append_ = timestamp_offset;
 
   // TODO(wolenetz/acolwell): Curry and pass a NewBuffersCB here bound with
   // append window and timestamp offset pointer. See http://crbug.com/351454.
   bool result = stream_parser_->Parse(data, length);
   if (!result) {
     MEDIA_LOG(ERROR, media_log_)
-        << __FUNCTION__ << ": stream parsing failed."
-        << " Data size=" << length
+        << __func__ << ": stream parsing failed. Data size=" << length
         << " append_window_start=" << append_window_start.InSecondsF()
         << " append_window_end=" << append_window_end.InSecondsF();
   }
   timestamp_offset_during_append_ = NULL;
   append_in_progress_ = false;
   return result;
 }
 
 void MediaSourceState::ResetParserState(TimeDelta append_window_start,
                                         TimeDelta append_window_end,
@@ skipping 60 matching lines @@
   CHECK_GE(videoRatio, 0.0);
   CHECK_LE(videoRatio, 1.0);
   double estimatedVideoSize = muxed_data_chunk_size * videoRatio;
   return static_cast<size_t>(estimatedVideoSize);
 }
 
 bool MediaSourceState::EvictCodedFrames(DecodeTimestamp media_time,
                                         size_t newDataSize) {
   bool success = true;
 
-  DVLOG(3) << __FUNCTION__ << " media_time=" << media_time.InSecondsF()
+  DVLOG(3) << __func__ << " media_time=" << media_time.InSecondsF()
            << " newDataSize=" << newDataSize
            << " videoBufferedSize=" << (video_ ? video_->GetBufferedSize() : 0)
            << " audioBufferedSize=" << (audio_ ? audio_->GetBufferedSize() : 0);
 
   size_t newAudioSize = 0;
   size_t newVideoSize = 0;
   if (audio_ && video_) {
     newVideoSize = EstimateVideoDataSize(newDataSize);
     newAudioSize = newDataSize - newVideoSize;
   } else if (video_) {
     newVideoSize = newDataSize;
   } else if (audio_) {
     newAudioSize = newDataSize;
   }
 
-  DVLOG(3) << __FUNCTION__ << " estimated audio/video sizes: "
-           << " newVideoSize=" << newVideoSize
+  DVLOG(3) << __func__
+           << " estimated audio/video sizes: newVideoSize=" << newVideoSize
            << " newAudioSize=" << newAudioSize;
 
   if (audio_)
     success = audio_->EvictCodedFrames(media_time, newAudioSize) && success;
 
   if (video_)
     success = video_->EvictCodedFrames(media_time, newVideoSize) && success;
 
   for (TextStreamMap::iterator itr = text_stream_map_.begin();
        itr != text_stream_map_.end(); ++itr) {
     success = itr->second->EvictCodedFrames(media_time, 0) && success;
   }
 
-  DVLOG(3) << __FUNCTION__ << " result=" << success
+  DVLOG(3) << __func__ << " result=" << success
            << " videoBufferedSize=" << (video_ ? video_->GetBufferedSize() : 0)
            << " audioBufferedSize=" << (audio_ ? audio_->GetBufferedSize() : 0);
 
   return success;
 }
 
 Ranges<TimeDelta> MediaSourceState::GetBufferedRanges(TimeDelta duration,
                                                       bool ended) const {
   // TODO(acolwell): When we start allowing disabled tracks we'll need to update
   // this code to only add ranges from active tracks.
@@ skipping 495 matching lines @@
 
 void MediaSourceState::OnSourceInitDone(
     const StreamParser::InitParameters& params) {
   DCHECK_EQ(state_, PENDING_PARSER_INIT);
   state_ = PARSER_INITIALIZED;
   auto_update_timestamp_offset_ = params.auto_update_timestamp_offset;
   base::ResetAndReturn(&init_cb_).Run(params);
 }
 
 }  // namespace media