Backed out changeset 79d402a25984 (bug 1036653)

media/webrtc/trunk/webrtc/modules/desktop_capture/x11/desktop_device_info_x11.cc

@@ -3,17 +3,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "webrtc/modules/desktop_capture/x11/desktop_device_info_x11.h"
-#include "webrtc/system_wrappers/interface/logging.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
-#include "webrtc/system_wrappers/interface/scoped_refptr.h"
-#include <unistd.h>
-#include <stdio.h>
-#include "webrtc/modules/desktop_capture/x11/shared_x_util.h"
 #include "webrtc/modules/desktop_capture/window_capturer.h"
 #include "webrtc/modules/desktop_capture/x11/x_error_trap.h"
 #include "webrtc/modules/desktop_capture/x11/x_server_pixel_buffer.h"
+#include "webrtc/system_wrappers/interface/logging.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/system_wrappers/interface/scoped_refptr.h"
+#include "webrtc/modules/desktop_capture/x11/shared_x_util.h"
+#include <unistd.h>
+#include <stdio.h>
 
-namespace webrtc {
+namespace webrtc{
 
 DesktopDeviceInfo * DesktopDeviceInfoImpl::Create() {
   DesktopDeviceInfoX11 * pDesktopDeviceInfo = new DesktopDeviceInfoX11();

media/webrtc/trunk/webrtc/modules/desktop_capture/x11/shared_x_util.h

@@ -11,17 +11,8 @@
 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_UTIL_H_
 #define WEBRTC_MODULES_DESKTOP_CAPTURE_X11_SHARED_X_UTIL_H_
 
-#include "webrtc/system_wrappers/interface/atomic32.h"
-#include "webrtc/system_wrappers/interface/scoped_refptr.h"
-#include "webrtc/modules/desktop_capture/x11/shared_x_display.h"
-#include "webrtc/system_wrappers/interface/logging.h"
-#include <unistd.h>
-#include <string.h>
-
 #include <map>
 #include <vector>
-#include <vector>
-#include <algorithm>
 
 #include <assert.h>
 #include <X11/Xlib.h>
@@ -32,6 +23,9 @@
 #include <X11/Xutil.h>
 #include <string>
 
+#include "webrtc/system_wrappers/interface/atomic32.h"
+#include "webrtc/system_wrappers/interface/scoped_refptr.h"
+
 namespace webrtc {
 
 //===============================================================================