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

media/base/media_win.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 <windows.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 
 // Enable timing code by turning on TESTING macro.
 //#define TESTING 1
 
 #ifdef TESTING
 #include "base/string_util.h"
 #include "base/time.h"
 #endif
 
 namespace media {
 
-namespace {
-
 enum FFmpegDLLKeys {
-  FILE_LIBAVCODEC,       // full path to libavcodec media decoding library.
-  FILE_LIBAVFORMAT,      // full path to libavformat media parsing library.
-  FILE_LIBAVUTIL,        // full path to libavutil media utility library.
+  FILE_LIBAVCODEC,   // full path to libavcodec media decoding library.
+  FILE_LIBAVFORMAT,  // full path to libavformat media parsing library.
+  FILE_LIBAVUTIL,    // full path to libavutil media utility library.
 };
 
 // Retrieves the DLLName for the given key.
-FilePath::CharType* GetDLLName(FFmpegDLLKeys dll_key) {
+static FilePath::CharType* GetDLLName(FFmpegDLLKeys dll_key) {
   // TODO(ajwong): Do we want to lock to a specific ffmpeg version?
   switch (dll_key) {
     case FILE_LIBAVCODEC:
       return FILE_PATH_LITERAL("avcodec-52.dll");
     case FILE_LIBAVFORMAT:
       return FILE_PATH_LITERAL("avformat-52.dll");
     case FILE_LIBAVUTIL:
       return FILE_PATH_LITERAL("avutil-50.dll");
     default:
       LOG(DFATAL) << "Invalid DLL key requested: " << dll_key;
       return FILE_PATH_LITERAL("");
   }
 }
 
-}  // namespace
-
 // Attempts to initialize the media library (loading DLLs, DSOs, etc.).
 // Returns true if everything was successfully initialized, false otherwise.
 bool InitializeMediaLibrary(const FilePath& base_path) {
   FFmpegDLLKeys path_keys[] = {
     media::FILE_LIBAVCODEC,
     media::FILE_LIBAVFORMAT,
     media::FILE_LIBAVUTIL
   };
   HMODULE libs[arraysize(path_keys)] = {NULL};
 
@@ skipping 31 matching lines @@
   }
   return false;
 }
 
 bool InitializeOpenMaxLibrary(const FilePath& module_dir) {
   NOTIMPLEMENTED() << "OpenMAX is not used in Windows.";
   return false;
 }
 
 }  // namespace media