Cleaning up src/media to be consistent with static versus anonymous namespaces.

media/omx/omx_unittest.cc

-// Copyright (c) 2009-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.
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/synchronization/waitable_event.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/openmax/il/OMX_Component.h"
 #include "third_party/openmax/il/OMX_Core.h"
 
-namespace {
+namespace media {
 
 // Defines the maximum number of buffers created for I/O ports.
-const int kMaxBufferNum = 256;
+static const int kMaxBufferNum = 256;
 
 template <typename T>
 static void ResetHeader(T* param) {
   memset(param, 0, sizeof(T));
   // TODO(hclam): Make this version number configurable.
   param->nVersion.nVersion = 0x00000101;
   param->nSize = sizeof(T);
 }
 
-}  // namespace
-
-namespace media {
-
 class OmxTest : public testing::Test {
  public:
   OmxTest()
       : handle_(NULL),
         event_(false, false),
         empty_buffer_(false, false),
         fill_buffer_(false, false),
         last_event_type_(OMX_EventMax),
         last_event_data1_(0),
         last_event_data2_(0) {
@@ skipping 377 matching lines @@
   // Then configure the component as usual.
   Configure(codec(), 1024, 768);
   TransitionLoadedToIdle();
   TransitionIdleToExecuting();
   TransitionExecutingToIdle();
   TransitionIdleToLoaded();
   DeinitComponent();
 }
 
 }  // namespace media