Update from https://crrev.com/317530

tools/git/move_source_file.py

 #!/usr/bin/env python
 # 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.
 
 """Moves C++ files to a new location, updating any include paths that point
 to them, and re-ordering headers as needed.  If multiple source files are
 specified, the destination must be a directory.  Updates include guards in
 moved header files.  Assumes Chromium coding style.
 
@@ skipping 13 matching lines @@
 import subprocess
 import sys
 
 import mffr
 
 if __name__ == '__main__':
   # Need to add the directory containing sort-headers.py to the Python
   # classpath.
   sys.path.append(os.path.abspath(os.path.join(sys.path[0], '..')))
 sort_headers = __import__('sort-headers')
+import sort_sources
 
 
 HANDLED_EXTENSIONS = ['.cc', '.mm', '.h', '.hh', '.cpp']
 
 
 def IsHandledFile(path):
   return os.path.splitext(path)[1] in HANDLED_EXTENSIONS
 
 
 def MakeDestinationPath(from_path, to_path):
@@ skipping 91 matching lines @@
     parts = re.split(r"[/\\]", path, 1)
     if len(parts) == 2:
       return (parts[0], parts[1])
     else:
       return (parts[0], '')
 
   visiting_directory = ''
   from_rest = from_path
   to_rest = to_path
   while True:
-    mffr.MultiFileFindReplace(
+    files_with_changed_sources = mffr.MultiFileFindReplace(
         r'([\'"])%s([\'"])' % from_rest,
         r'\1%s\2' % to_rest,
         [os.path.join(visiting_directory, 'BUILD.gn'),
          os.path.join(visiting_directory, '*.gyp*')])
+    for changed_file in files_with_changed_sources:
+      sort_sources.ProcessFile(changed_file, should_confirm=False)
     from_first, from_rest = SplitByFirstComponent(from_rest)
     to_first, to_rest = SplitByFirstComponent(to_rest)
     visiting_directory = os.path.join(visiting_directory, from_first)
     if not from_rest or not to_rest:
         break
 
 
 def MakeIncludeGuardName(path_from_root):
   """Returns an include guard name given a path from root."""
   guard = path_from_root.replace('/', '_')
@@ skipping 63 matching lines @@
       continue
     to_path = MakeDestinationPath(from_path, orig_to_path)
     if not opts.already_moved:
       MoveFile(from_path, to_path)
     UpdatePostMove(from_path, to_path)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())