Update instrumentation for many different bugs based on new UMA data.

content/browser/renderer_host/media/media_stream_manager.cc

 // Copyright (c) 2012 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 "content/browser/renderer_host/media/media_stream_manager.h"
 
 #include <list>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 1616 matching lines @@
     audio_input_device_manager()->UseFakeDevice();
   }
 
   video_capture_manager_ =
       new VideoCaptureManager(media::VideoCaptureDeviceFactory::CreateFactory(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)));
 #if defined(OS_WIN)
   // Use an STA Video Capture Thread to try to avoid crashes on enumeration of
   // buggy third party Direct Show modules, http://crbug.com/428958.
   video_capture_thread_.init_com_with_mta(false);
-  // TODO(pkasting): Remove ScopedTracker below once crbug.com/457525 is fixed.
-  tracked_objects::ScopedTracker tracking_profile1(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread1"));
-  CHECK(video_capture_thread_.Start());
-  // TODO(pkasting): Remove ScopedTracker below once crbug.com/457525 is fixed.
-  tracked_objects::ScopedTracker tracking_profile2(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "457525 MediaStreamManager::InitializeDeviceManagersOnIOThread2"));
+  {
+    // TODO(pkasting): Remove ScopedTracker below once crbug.com/457525 is
+    // fixed.
+    tracked_objects::ScopedTracker tracking_profile(
+        FROM_HERE_WITH_EXPLICIT_FUNCTION(
+            "457525 "
+            "MediaStreamManager::InitializeDeviceManagersOnIOThread -> Start"));
+    CHECK(video_capture_thread_.Start());
+  }
   video_capture_manager_->Register(this,
                                    video_capture_thread_.message_loop_proxy());
 #else
   video_capture_manager_->Register(this, device_task_runner_);
 #endif
 }
 
 void MediaStreamManager::Opened(MediaStreamType stream_type,
                                 int capture_session_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 514 matching lines @@
   }
 }
 
 void MediaStreamManager::SetKeyboardMicOnDeviceThread() {
   DCHECK(device_task_runner_->BelongsToCurrentThread());
   audio_manager_->SetHasKeyboardMic();
 }
 #endif
 
 }  // namespace content