Merge "Merge upstream SHA 04cb763"android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release

am: 9a337512d9

* commit '9a337512d97e37afc142dee4fd50a41b741a87d2': (797 commits)
  Add tests for verifying transport feedback for audio and video.
  Eliminate defines in talk/
  Revert of Update with new default boringssl no-aes cipher suites. Re-enable tests. (patchset #3 id:40001 of https://codereview.webrtc.org/1550773002/ )
  Remove assert which was incorrectly added to TcpPort::OnSentPacket.
  Reland Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Update with new default boringssl no-aes cipher suites. Re-enable tests.
  Revert of Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. (patchset #3 id:40001 of https://codereview.webrtc.org/1577873003/ )
  Re-land: "Use an explicit identifier in Config"
  Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Revert of Delete remnants of non-square pixel support from cricket::VideoFrame. (patchset #1 id:1 of https://codereview.webrtc.org/1586613002/ )
  Remove libfuzzer trybot from default trybot set.
  Add ramp-up tests for transport sequence number with and w/o audio.
  Delete remnants of non-square pixel support from cricket::VideoFrame.
  Fix IPAddress::ToSensitiveString() to avoid dependency on inet_ntop().
  Revert of Storing raw audio sink for default audio track. (patchset #7 id:120001 of https://codereview.chromium.org/1551813002/ )
  Re-enable tests that failed under Linux_Msan.
  Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ )
  Roll chromium_revision 346fea9..099be58 (369082:369139)
  Disable WebRtcVideoChannel2BaseTest.SendManyResizeOnce for TSan
  Add build_protobuf variable.
  ...

1 files changed, 0 insertions, 145 deletions

diff --git a/tools/refactoring/fixincludeguards.py b/tools/refactoring/fixincludeguards.py
deleted file mode 100644
index 0b563556ba..0000000000
--- a/tools/refactoring/fixincludeguards.py
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/env python
-
-import stringmanipulation
-import filemanagement
-import sys
-
-extensions = ['.h']
-
-ignore_these = ['my_ignore_header.h']
-
-if((len(sys.argv) != 2) and (len(sys.argv) != 3)):
-    print 'parameters are: directory [--commit]'
-    quit()
-
-directory = sys.argv[1];
-if(not filemanagement.pathexist(directory)):
-    print 'path ' + directory + ' does not exist'
-    quit()
-
-if((len(sys.argv) == 3) and (sys.argv[2] != '--commit')):
-    print 'parameters are: parent directory extension new extension [--commit]'
-    quit()
-
-commit = False
-if(len(sys.argv) == 3):
-    commit = True
-
-for extension in extensions:
-    files_to_fix = filemanagement.listallfilesinfolder(directory,\
-                                                       extension)
-
-def buildincludeguardname(path,filename):
-    full_file_name = 'WEBRTC_' + path + filename
-    full_file_name = full_file_name.upper()
-    full_file_name = stringmanipulation.replaceoccurances(full_file_name, '/', '_')
-    full_file_name = stringmanipulation.replaceoccurances(full_file_name, '\\', '_')
-    full_file_name = stringmanipulation.replaceoccurances(full_file_name, '.', '_')
-    full_file_name += '_'
-    return full_file_name
-
-def buildnewincludeguardset(path,filename):
-    include_guard_name = buildincludeguardname(path,filename)
-    if(include_guard_name == ''):
-        return []
-    return_value = []
-    return_value.append('#ifndef ' + include_guard_name)
-    return_value.append('#define ' + include_guard_name)
-    return_value.append(include_guard_name)
-    return return_value
-
-def printincludeguardset(include_guard_set):
-    print 'First line: ' + include_guard_set[0]
-    print 'Second line: ' + include_guard_set[1]
-    print 'Last line: ' + include_guard_set[2]
-    return
-
-include_guard_begin_identifier = ['#ifndef', '#if !defined']
-include_guard_second_identifier = ['#define']
-def findincludeguardidentifier(line):
-    for begin_identifier in include_guard_begin_identifier:
-        line = stringmanipulation.removealloccurances(line,begin_identifier)
-    for second_identifier in include_guard_begin_identifier:
-        line = stringmanipulation.removealloccurances(line,second_identifier)
-    removed_prefix = [True,'']
-    line = stringmanipulation.whitespacestoonespace(line)
-    while(removed_prefix[0]):
-        removed_prefix = stringmanipulation.removeprefix(line,' ')
-        line = removed_prefix[1]
-    line = stringmanipulation.removealloccurances(line,'(')
-    if(line == ''):
-        return ''
-    word_pos = stringmanipulation.getword(line,0)
-    return_value = line[0:word_pos[1]]
-    return_value = return_value.rstrip('\r\n')
-    return return_value
-
-def findoldincludeguardset(path,filename):
-    return_value = []
-    full_file_name = path + filename
-    file_pointer = open(full_file_name,'r')
-    include_guard_name = ''
-    for line in file_pointer:
-        if (include_guard_name == ''):
-            for compare_string in include_guard_begin_identifier:
-                if (stringmanipulation.issubstring(compare_string, line) != -1):
-                    include_guard_name = findincludeguardidentifier(line)
-                    if (include_guard_name == ''):
-                        break
-                    line = line.rstrip('\r\n')
-                    return_value.append(line)
-                    break
-        else:
-            for compare_string in include_guard_second_identifier:
-                if (stringmanipulation.issubstring(compare_string, line) != -1):
-                    if (stringmanipulation.issubstring(include_guard_name, line) != -1):
-                        line = line.rstrip('\r\n')
-                        return_value.append(line)
-                        return_value.append(include_guard_name)
-                        return return_value
-            include_guard_name = ''
-            return_value = []
-    return []
-
-failed_files = []
-for index in range(len(files_to_fix)):
-    if(commit):
-        print (100*index)/len(files_to_fix)
-    path_dir = files_to_fix[index][0]
-    filename = files_to_fix[index][1]
-    is_ignore = False
-    for ignore_names in ignore_these:
-        if(filename == ignore_names):
-            is_ignore = True
-            break
-    if(is_ignore):
-        continue
-    old_include_guard_set = findoldincludeguardset(path_dir,filename)
-    if (len(old_include_guard_set) != 3) :
-        failed_files.append('unable to figure out the include guards for ' + filename)
-        continue
-
-    new_include_guard_set = buildnewincludeguardset(path_dir,filename)
-    if (len(new_include_guard_set) != 3) :
-        failed_files.append('unable to figure out new the include guards for ' + filename)
-        continue
-
-    if(not commit):
-        print 'old guard: ' + old_include_guard_set[2]
-        print 'new guard: ' + new_include_guard_set[2]
-        continue
-
-    for index in range(2):
-        # enough to only replace for file. However, no function for that
-        for extension in extensions:
-            filemanagement.replacestringinfolder(path_dir,old_include_guard_set[index],new_include_guard_set[index],extension)
-    # special case for last to avoid complications
-    for extension in extensions:
-        filemanagement.replacestringinfolder(path_dir,' ' + old_include_guard_set[2],' ' + new_include_guard_set[2],extension)
-        filemanagement.replacestringinfolder(path_dir,'\\/\\/' + old_include_guard_set[2],'\\/\\/ ' + new_include_guard_set[2],extension)
-
-
-if(len(failed_files) > 0):
-    print 'Following failures should be investigated manually:'
-for line in failed_files:
-    print line