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

media/base/media_posix.cc

-// 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.
 
 #include "media/base/media.h"
 
 #include <string>
 
 #include <dlfcn.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/stringize_macros.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "third_party/ffmpeg/ffmpeg_stubs.h"
 #if defined(OS_LINUX)
 // OpenMAX IL stub is generated only on Linux.
 #include "third_party/openmax/il_stubs.h"
 #endif
 
 namespace tp_ffmpeg = third_party_ffmpeg;
 
 namespace media {
 
-namespace {
-
 // Handy to prevent shooting ourselves in the foot with macro wizardry.
 #if !defined(LIBAVCODEC_VERSION_MAJOR) || \
     !defined(LIBAVFORMAT_VERSION_MAJOR) || \
     !defined(LIBAVUTIL_VERSION_MAJOR)
 #error FFmpeg headers not included!
 #endif
 
 #define AVCODEC_VERSION STRINGIZE(LIBAVCODEC_VERSION_MAJOR)
 #define AVFORMAT_VERSION STRINGIZE(LIBAVFORMAT_VERSION_MAJOR)
 #define AVUTIL_VERSION STRINGIZE(LIBAVUTIL_VERSION_MAJOR)
 
 #if defined(OS_MACOSX)
 #define DSO_NAME(MODULE, VERSION) ("lib" MODULE "." VERSION ".dylib")
-const FilePath::CharType sumo_name[] =
+static const FilePath::CharType sumo_name[] =
     FILE_PATH_LITERAL("libffmpegsumo.dylib");
 #elif defined(OS_POSIX)
 #define DSO_NAME(MODULE, VERSION) ("lib" MODULE ".so." VERSION)
-const FilePath::CharType sumo_name[] = FILE_PATH_LITERAL("libffmpegsumo.so");
+static const FilePath::CharType sumo_name[] =
+    FILE_PATH_LITERAL("libffmpegsumo.so");
 #else
 #error "Do not know how to construct DSO name for this OS."
 #endif
-const FilePath::CharType openmax_name[] = FILE_PATH_LITERAL("libOmxCore.so");
+static const FilePath::CharType openmax_name[] =
+    FILE_PATH_LITERAL("libOmxCore.so");
 
 // Retrieves the DSOName for the given key.
-std::string GetDSOName(tp_ffmpeg::StubModules stub_key) {
+static std::string GetDSOName(tp_ffmpeg::StubModules stub_key) {
   // TODO(ajwong): Remove this once mac is migrated. Either that, or have GYP
   // set a constant that we can switch implementations based off of.
   switch (stub_key) {
     case tp_ffmpeg::kModuleAvcodec52:
       return FILE_PATH_LITERAL(DSO_NAME("avcodec", AVCODEC_VERSION));
     case tp_ffmpeg::kModuleAvformat52:
       return FILE_PATH_LITERAL(DSO_NAME("avformat", AVFORMAT_VERSION));
     case tp_ffmpeg::kModuleAvutil50:
       return FILE_PATH_LITERAL(DSO_NAME("avutil", AVUTIL_VERSION));
     default:
       LOG(DFATAL) << "Invalid stub module requested: " << stub_key;
       return FILE_PATH_LITERAL("");
   }
 }
 
-}  // namespace
-
 // Attempts to initialize the media library (loading DSOs, etc.).
 // Returns true if everything was successfully initialized, false otherwise.
 bool InitializeMediaLibrary(const FilePath& module_dir) {
   // TODO(ajwong): We need error resolution.
   tp_ffmpeg::StubPathMap paths;
   for (int i = 0; i < static_cast<int>(tp_ffmpeg::kNumStubModules); ++i) {
     tp_ffmpeg::StubModules module = static_cast<tp_ffmpeg::StubModules>(i);
 
     // Add the sumo library first so it takes precedence.
     paths[module].push_back(module_dir.Append(sumo_name).value());
@@ skipping 27 matching lines @@
   return result;
 }
 #else
 bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
   NOTIMPLEMENTED() << "OpenMAX is only used in Linux.";
   return false;
 }
 #endif
 
 }  // namespace media