Update from https://crrev.com/316786

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 88 matching lines @@
   # used in our code.
   #
   # This work takes a bit of time. If this script starts feeling too
   # slow, one good way to speed it up is to make the comment handling
   # optional under a flag.
   mffr.MultiFileFindReplace(
       r'(//.*)%s' % re.escape(from_path),
       r'\1%s' % to_path,
       ['*.cc', '*.h', '*.m', '*.mm', '*.cpp'])
 
-  # Update references in .gyp(i) files.
-  def PathMinusFirstComponent(path):
-    """foo/bar/baz -> bar/baz"""
-    parts = re.split(r"[/\\]", path, 1)
-    if len(parts) == 2:
-      return parts[1]
-    else:
-      return parts[0]
-  mffr.MultiFileFindReplace(
-      r'([\'"])%s([\'"])' % re.escape(PathMinusFirstComponent(from_path)),
-      r'\1%s\2' % PathMinusFirstComponent(to_path),
-      ['*.gyp*'])
-
-  # Update references in BUILD.gn files.
+  # Update references in GYP and BUILD.gn files.
   #
-  # Unlike .gyp(i) files, BUILD.gn files can be placed in any directories,
-  # and paths in a BUILD.gn file are relative to the directory where the
-  # BUILD.gn file is placed.
+  # GYP files are mostly located under the first level directory (ex.
+  # chrome/chrome_browser.gypi), but sometimes they are located in
+  # directories at a deeper level (ex. extensions/shell/app_shell.gypi). On
+  # the other hand, BUILD.gn files can be placed in any directories.
+  #
+  # Paths in a GYP or BUILD.gn file are relative to the directory where the
+  # file is placed.
   #
   # For instance, "chrome/browser/chromeos/device_uma.h" is listed as
   # "browser/chromeos/device_uma.h" in "chrome/chrome_browser_chromeos.gypi",
   # but it's listed as "device_uma.h" in "chrome/browser/chromeos/BUILD.gn".
   #
   # To handle this, the code here will visit directories from the top level
-  # src directory to the directory of |from_path| and try to update BUILD.gn
-  # in each directory.
+  # src directory to the directory of |from_path| and try to update GYP and
+  # BUILD.gn files in each directory.
   #
-  # The code only handles files moved/renamed within the same BUILD.gn
-  # file. If files are moved beyond the same BUILD.gn file, the affected
-  # BUILD.gn files should be fixed manually.
+  # The code only handles files moved/renamed within the same build file. If
+  # files are moved beyond the same build file, the affected build files
+  # should be fixed manually.
   def SplitByFirstComponent(path):
     """'foo/bar/baz' -> ('foo', 'bar/baz')
        'bar' -> ('bar', '')
        '' -> ('', '')
     """
     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(
         r'([\'"])%s([\'"])' % from_rest,
         r'\1%s\2' % to_rest,
-        [os.path.join(visiting_directory, 'BUILD.gn')])
+        [os.path.join(visiting_directory, 'BUILD.gn'),
+         os.path.join(visiting_directory, '*.gyp*')])
     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())