| Index: media/omx/omx_codec_unittest.cc
|
| diff --git a/media/omx/omx_codec_unittest.cc b/media/omx/omx_codec_unittest.cc
|
| index 5dbde659e83508cb794e8965616b4530118b96d3..06fa31e593887a0326839c4b7fa33d1419f5963f 100644
|
| --- a/media/omx/omx_codec_unittest.cc
|
| +++ b/media/omx/omx_codec_unittest.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -30,15 +30,12 @@ using ::testing::SetArgumentPointee;
|
| using ::testing::StrEq;
|
| using ::testing::StrictMock;
|
|
|
| -namespace {
|
| -
|
| -const int kBufferCount = 3;
|
| -const int kBufferSize = 4096;
|
| -const char* kComponentName = "OMX.google.video_decoder.avc";
|
| +namespace media {
|
|
|
| -} // namespace
|
| +static const int kBufferCount = 3;
|
| +static const int kBufferSize = 4096;
|
| +static const char* kComponentName = "OMX.google.video_decoder.avc";
|
|
|
| -namespace media {
|
| ACTION(ReturnComponentName) {
|
| strcpy(((char**)arg2)[0], kComponentName);
|
| }
|
|
|