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

media/omx/omx_configurator.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.  Use of this
+// 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 "media/omx/omx_configurator.h"
 
 #include "base/logging.h"
 
-namespace {
+namespace media {
 
-std::string GetCodecName(media::OmxConfigurator::Codec codec) {
+static std::string GetCodecName(OmxConfigurator::Codec codec) {
   switch (codec) {
-    case media::OmxConfigurator::kCodecH264:
+    case OmxConfigurator::kCodecH264:
       return "avc";
-    case media::OmxConfigurator::kCodecH263:
+    case OmxConfigurator::kCodecH263:
       return "h263";
-    case media::OmxConfigurator::kCodecMpeg4:
+    case OmxConfigurator::kCodecMpeg4:
       return "mpeg4";
-    case media::OmxConfigurator::kCodecVc1:
+    case OmxConfigurator::kCodecVc1:
       return "vc1";
     default:
       break;
   }
   NOTREACHED();
   return "";
 }
 
-}  // namespace
-
-namespace media {
-
 std::string OmxDecoderConfigurator::GetRoleName() const {
   return "video_decoder." + GetCodecName(input_format().codec);
 }
 
 bool OmxDecoderConfigurator::ConfigureIOPorts(
     OMX_COMPONENTTYPE* component,
     OMX_PARAM_PORTDEFINITIONTYPE* input_port_def,
     OMX_PARAM_PORTDEFINITIONTYPE* output_port_def) const {
   // Configure the input port.
   if (input_format().codec == kCodecNone) {
@@ skipping 121 matching lines @@
                             OMX_IndexConfigVideoFramerate,
                             &framerate);
   if (omxresult != OMX_ErrorNone) {
     LOG(ERROR) << "SetParameter(OMX_IndexConfigVideoFramerate) failed";
     return false;
   }
   return true;
 }
 
 }  // namespace media