Fix Revert of 89054 so it builds on win_shared

TEST=builds on win_shared
BUG=none

Review URL: http://codereview.chromium.org/7167001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89096 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/gpu/gpu_process_host.cc

@@ -198,7 +198,7 @@ GpuProcessHost* GpuProcessHost::GetForRenderer(
   return NULL;
 }
 
-// static 
+// static
 void GpuProcessHost::SendOnIO(int renderer_id,
                               content::CauseForGpuLaunch cause,
                               IPC::Message* message) {
@@ -414,7 +414,7 @@ void GpuProcessHost::OnChannelEstablished(
                           GPUInfo());
     RouteOnUIThread(GpuHostMsg_OnLogMessage(
         logging::LOG_WARNING,
-        "WARNING", 
+        "WARNING",
         "Hardware acceleration is unavailable."));
     return;
   }
@@ -527,6 +527,7 @@ bool GpuProcessHost::LaunchGpuProcess() {
     switches::kDisableGpuVsync,
     switches::kDisableGpuWatchdog,
     switches::kDisableLogging,
+    switches::kEnableGPUServiceLogging,
     switches::kEnableLogging,
 #if defined(OS_MACOSX)
     switches::kEnableSandboxLogging,

content/browser/renderer_host/browser_render_process_host.cc

@@ -536,6 +536,8 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kEnableAdaptive,
     switches::kEnableBenchmarking,
     switches::kEnableDCHECK,
+    switches::kEnableGPUServiceLogging,
+    switches::kEnableGPUClientLogging,
     switches::kEnableLogging,
     switches::kEnableOpenMax,
 #if defined(ENABLE_P2P_APIS)