Clean up include files for third_party libs

Change-Id: Ie1b48d3c22d646a58472d759963f98614a444cce

app/libcrypto_threading_posix.cc

@@ -6,10 +6,10 @@
 
 #include "app/libcrypto_threading.h"
 
+#include <openssl/crypto.h>
 #include <pthread.h>
-#include <vector>
 
-#include "openssl/crypto.h"
+#include <vector>
 
 namespace {
 

media/file/udp_file.cc

@@ -8,6 +8,7 @@
 
 #include <arpa/inet.h>
 #include <errno.h>
+#include <gflags/gflags.h>
 #include <strings.h>
 #include <sys/socket.h>
 #include <unistd.h>
@@ -16,7 +17,6 @@
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
-#include "gflags/gflags.h"
 
 // TODO(tinskip): Adapt to work with winsock.
 

media/formats/mp2t/adts_header.cc

@@ -4,7 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-#include "adts_header.h"
+#include "media/formats/mp2t/adts_header.h"
 
 #include "media/base/bit_reader.h"
 #include "media/formats/mp2t/mp2t_common.h"

media/formats/wvm/wvm.gyp

@@ -5,15 +5,9 @@
 # https://developers.google.com/open-source/licenses/bsd
 
 {
-  'variables': {
-    # Compile as chromium code to enable warnings and warnings-as-errors.
-    'chromium_code': 1,
-  },
-  'target_defaults': {
-    'include_dirs': [
-      '../../..',
-    ],
-  },
+  'includes': [
+    '../../../common.gypi',
+  ],
   'targets': [
     {
       'target_name': 'wvm',
@@ -25,7 +19,7 @@
       'dependencies': [
         '../../base/media_base.gyp:base',
         '../../filters/filters.gyp:filters',
-	'../../formats/mp2t/mp2t.gyp:mp2t',
+        '../../formats/mp2t/mp2t.gyp:mp2t',
         '../mpeg/mpeg.gyp:mpeg',
       ],
     },

media/formats/wvm/wvm_media_parser.cc

@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "media/formats/wvm/wvm_media_parser.h"
+
 #include <map>
 #include <sstream>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
+#include "media/base/audio_stream_info.h"
+#include "media/base/media_sample.h"
+#include "media/base/video_stream_info.h"
 #include "media/formats/mp2t/adts_header.h"
-#include "media/formats/wvm/wvm_media_parser.h"
-
 
 #define HAS_HEADER_EXTENSION(x) ((x != 0xBC) && (x != 0xBE) && (x != 0xBF) \
          && (x != 0xF0) && (x != 0xF2) && (x != 0xF8) \
@@ -41,28 +42,28 @@ const uint32_t kPesStreamIdVideo = 0xE0;
 const uint32_t kPesStreamIdAudioMask = 0xE0;
 const uint32_t kPesStreamIdAudio = 0xC0;
 const uint32_t kVersion4 = 4;
-  const int kAdtsHeaderMinSize = 7;
-  const uint8_t kAacSampleSizeBits = 16;
-  // Applies to all video streams.
-  const uint8_t kNaluLengthSize = 4;  // unit is bytes.
-  // Placeholder sampling frequency for all audio streams, which
-  // will be overwritten after filter parsing.
-  const uint32_t kDefaultSamplingFrequency = 100;
+const int kAdtsHeaderMinSize = 7;
+const uint8_t kAacSampleSizeBits = 16;
+// Applies to all video streams.
+const uint8_t kNaluLengthSize = 4;  // unit is bytes.
+// Placeholder sampling frequency for all audio streams, which
+// will be overwritten after filter parsing.
+const uint32_t kDefaultSamplingFrequency = 100;
 
-  enum Type {
-    Type_void = 0,
-    Type_uint8 = 1,
-    Type_int8 = 2,
-    Type_uint16 = 3,
-    Type_int16 = 4,
-    Type_uint32 = 5,
-    Type_int32 = 6,
-    Type_uint64 = 7,
-    Type_int64 = 8,
-    Type_string = 9,
-    Type_BinaryData = 10
-  };
-}
+enum Type {
+  Type_void = 0,
+  Type_uint8 = 1,
+  Type_int8 = 2,
+  Type_uint16 = 3,
+  Type_int16 = 4,
+  Type_uint32 = 5,
+  Type_int32 = 6,
+  Type_uint64 = 7,
+  Type_int64 = 8,
+  Type_string = 9,
+  Type_BinaryData = 10
+};
+}  // namespace
 
 namespace edash_packager {
 namespace media {

media/formats/wvm/wvm_media_parser.h

@@ -6,18 +6,17 @@
 #ifndef MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
 #define MEDIA_FORMATS_WVM_WVM_MEDIA_PARSER_H_
 
+#include <openssl/sha.h>
+
 #include <deque>
 #include <map>
 #include <string>
 #include <vector>
+
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_parser.h"
-#include "media/base/audio_stream_info.h"
-#include "media/base/video_stream_info.h"
-#include "media/base/media_sample.h"
 #include "media/base/network_util.h"
 #include "media/filters/h264_byte_to_unit_stream_converter.h"
-#include "openssl/sha.h"
 
 namespace edash_packager {
 namespace media {