Switch to standard integer types in media/, take 2.

media/capture/content/screen_capture_device_core.cc

 // Copyright 2014 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/capture/content/screen_capture_device_core.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_checker.h"
 
 namespace media {
 
 namespace {
 
@@ skipping 101 matching lines @@
     return;
 
   if (oracle_proxy_.get())
     oracle_proxy_->ReportError(from_here, reason);
 
   StopAndDeAllocate();
   TransitionStateTo(kError);
 }
 
 }  // namespace media