Fix hunk handling for 'default hunk header values'.

testing_support/patches_data.py

 # coding: utf-8
 # 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.
 
 """Samples patches to test patch.py."""
 
 
 class RAW(object):
   PATCH = (
@@ skipping 134 matching lines @@
       '+++ b/chrome/file.cc\n'
       '@@ -3,6 +3,7 @@ bb\n'
       ' ccc\n'
       ' dd\n'
       ' e\n'
       '+FOO!\n'
       ' ff\n'
       ' ggg\n'
       ' hh\n')
 
+  # http://codereview.chromium.org/download/issue10868039_12001_10003.diff
+  PATCH_SHORT_HUNK_HEADER = (
+      'Index: chrome/browser/api/OWNERS\n'
+      'diff --git a/chrome/browser/api/OWNERS b/chrome/browser/api/OWNERS\n'
+      '--- a/chrome/browser/api/OWNERS\n'
+      '+++ b/chrome/browser/api/OWNERS\n'
+      '@@ -1 +1,2 @@\n'
+      '+erikwright@chromium.org\n'
+      ' joi@chromium.org\n')
+
   # http://codereview.chromium.org/download/issue6368055_22_29.diff
   DELETE = (
       'Index: tools/clang_check/README.chromium\n'
       'diff --git a/tools/clang_check/README.chromium '
           'b/tools/clang_check/README.chromium\n'
       'deleted file mode 100644\n'
       'index fcaa7e0e94bb604a026c4f478fecb1c5796f5413..'
           '0000000000000000000000000000000000000000\n'
       '--- a/tools/clang_check/README.chromium\n'
       '+++ /dev/null\n'
@@ skipping 157 matching lines @@
       ' \n'
       '   def GenerateScmDiff(self):\n'
       '-    return scm.GIT.GenerateDiff(self._local_root, files=[self.Lo...\n'
       '+    if self._diff is None:\n'
       '+      self._diff = scm.GIT.GenerateDiff(\n'
       '+          self._local_root, files=[self.LocalPath(),])\n'
       '+    return self._diff\n'
       ' \n'
       ' \n'
       ' class Change(object):\n')