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

media/audio/win/audio_manager_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/audio/audio_io.h"
 
 #include <windows.h>
 #include <objbase.h>  // This has to be before initguid.h
 #include <initguid.h>
 #include <mmsystem.h>
 #include <setupapi.h>
@@ skipping 18 matching lines @@
 #pragma comment(lib, "setupapi.lib")
 
 // The following are defined in various DDK headers, and we (re)define them
 // here to avoid adding the DDK as a chrome dependency.
 #define DRV_QUERYDEVICEINTERFACE 0x80c
 #define DRVM_MAPPER_PREFERRED_GET 0x2015
 #define DRV_QUERYDEVICEINTERFACESIZE 0x80d
 DEFINE_GUID(AM_KSCATEGORY_AUDIO, 0x6994ad04, 0x93ef, 0x11d0,
             0xa3, 0xcc, 0x00, 0xa0, 0xc9, 0x22, 0x31, 0x96);
 
-namespace {
-
 // Maximum number of output streams that can be open simultaneously.
-const size_t kMaxOutputStreams = 50;
+static const size_t kMaxOutputStreams = 50;
 
 // Up to 8 channels can be passed to the driver.
 // This should work, given the right drivers, but graceful error handling is
 // needed.
-const int kWinMaxChannels = 8;
+static const int kWinMaxChannels = 8;
 
-const int kWinMaxInputChannels = 2;
+static const int kWinMaxInputChannels = 2;
 // We use 3 buffers for recording audio so that if a recording callback takes
 // some time to return we won't lose audio. More buffers while recording are
 // ok because they don't introduce any delay in recording, unlike in playback
 // where you first need to fill in that number of buffers before starting to
 // play.
-const int kNumInputBuffers = 3;
+static const int kNumInputBuffers = 3;
 
-int GetVersionPartAsInt(DWORDLONG num) {
+static int GetVersionPartAsInt(DWORDLONG num) {
   return static_cast<int>(num & 0xffff);
 }
 
 // Returns a string containing the given device's description and installed
 // driver version.
-string16 GetDeviceAndDriverInfo(HDEVINFO device_info,
-                                SP_DEVINFO_DATA* device_data) {
+static string16 GetDeviceAndDriverInfo(HDEVINFO device_info,
+                                       SP_DEVINFO_DATA* device_data) {
   // Save the old install params setting and set a flag for the
   // SetupDiBuildDriverInfoList below to return only the installed drivers.
   SP_DEVINSTALL_PARAMS old_device_install_params;
   old_device_install_params.cbSize = sizeof(old_device_install_params);
   SetupDiGetDeviceInstallParams(device_info, device_data,
                                 &old_device_install_params);
   SP_DEVINSTALL_PARAMS device_install_params = old_device_install_params;
   device_install_params.FlagsEx |= DI_FLAGSEX_INSTALLEDDRIVER;
   SetupDiSetDeviceInstallParams(device_info, device_data,
                                 &device_install_params);
@@ skipping 14 matching lines @@
     }
     SetupDiDestroyDriverInfoList(device_info, device_data, SPDIT_COMPATDRIVER);
   }
 
   SetupDiSetDeviceInstallParams(device_info, device_data,
                                 &old_device_install_params);
 
   return device_and_driver_info;
 }
 
-}  // namespace
-
 AudioManagerWin::AudioManagerWin()
     : num_output_streams_(0) {
 }
 
 AudioManagerWin::~AudioManagerWin() {
 }
 
 bool AudioManagerWin::HasAudioOutputDevices() {
   return (::waveOutGetNumDevs() != 0);
 }
@@ skipping 142 matching lines @@
   path = path.Append(program);
   CommandLine command_line(path);
   command_line.AppendArg(argument);
   base::LaunchApp(command_line, false, false, NULL);
 }
 
 // static
 AudioManager* AudioManager::CreateAudioManager() {
   return new AudioManagerWin();
 }