Remove two static initializers (media/base/{buffers,media_log}.cc)

webkit/media/video_renderer_impl_unittest.cc

 // Copyright (c) 2012 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/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkDevice.h"
 #include "webkit/media/video_renderer_impl.h"
@@ skipping 149 matching lines @@
 TEST_F(VideoRendererImplTest, SlowPaint_Smaller) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 
   Paint(smaller_frame(), slow_path_canvas(), kBlue);
   EXPECT_EQ(SK_ColorBLUE, GetColor(slow_path_canvas()));
 }
 
 TEST_F(VideoRendererImplTest, FastPaint_NoTimestamp) {
   VideoFrame* video_frame = natural_frame();
-  video_frame->SetTimestamp(media::kNoTimestamp);
+  video_frame->SetTimestamp(media::kNoTimestamp());
   Paint(video_frame, fast_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
 }
 
 TEST_F(VideoRendererImplTest, SlowPaint_NoTimestamp) {
   VideoFrame* video_frame = natural_frame();
-  video_frame->SetTimestamp(media::kNoTimestamp);
+  video_frame->SetTimestamp(media::kNoTimestamp());
   Paint(video_frame, slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 }
 
 TEST_F(VideoRendererImplTest, FastPaint_SameVideoFrame) {
   Paint(natural_frame(), fast_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(fast_path_canvas()));
 
   // Fast paints always get painted to the canvas.
   Paint(natural_frame(), fast_path_canvas(), kBlue);
   EXPECT_EQ(SK_ColorBLUE, GetColor(fast_path_canvas()));
 }
 
 TEST_F(VideoRendererImplTest, SlowPaint_SameVideoFrame) {
   Paint(natural_frame(), slow_path_canvas(), kRed);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 
   // Slow paints can get cached, expect the old color value.
   Paint(natural_frame(), slow_path_canvas(), kBlue);
   EXPECT_EQ(SK_ColorRED, GetColor(slow_path_canvas()));
 }
 
 }  // namespace webkit_media