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

media/tools/shader_bench/window_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/tools/shader_bench/window.h"
 
 #include "base/task.h"
 #include "media/tools/shader_bench/painter.h"
 
-namespace {
+namespace media {
 
-LRESULT CALLBACK WindowProc(HWND hwnd, UINT msg,
-                            WPARAM w_param, LPARAM l_param) {
+static LRESULT CALLBACK WindowProc(HWND hwnd, UINT msg,
+                                   WPARAM w_param, LPARAM l_param) {
   LRESULT result = 0;
   switch (msg) {
     case WM_CLOSE:
       ::DestroyWindow(hwnd);
       break;
     case WM_DESTROY:
       ::PostQuitMessage(0);
       break;
     case WM_ERASEBKGND:
       // Return a non-zero value to indicate that the background has been
       // erased.
       result = 1;
       break;
     case WM_PAINT: {
-      media::Window* window =
-          reinterpret_cast<media::Window*>(
-              GetWindowLongPtr(hwnd, GWL_USERDATA));
+      Window* window =
+          reinterpret_cast<Window*>(GetWindowLongPtr(hwnd, GWL_USERDATA));
       if (window != NULL)
         window->OnPaint();
       ::ValidateRect(hwnd, NULL);
       break;
     }
     default:
       result = ::DefWindowProc(hwnd, msg, w_param, l_param);
       break;
   }
   return result;
 }
 
-}  // namespace
-
-namespace media {
-
 gfx::NativeWindow Window::CreateNativeWindow(int width, int height) {
   WNDCLASS wnd_class = {0};
   HINSTANCE instance = GetModuleHandle(NULL);
   wnd_class.style = CS_OWNDC;
   wnd_class.lpfnWndProc = WindowProc;
   wnd_class.hInstance = instance;
   wnd_class.hbrBackground =
       reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH));
   wnd_class.lpszClassName = L"gpu_demo";
   if (!RegisterClass(&wnd_class))
@@ skipping 73 matching lines @@
         done = true;
       ::TranslateMessage(&msg);
       ::DispatchMessage(&msg);
       if (!done)
         ::InvalidateRect(window_handle_, NULL, FALSE);
     }
   }
 }
 
 }  // namespace media