Revert "Move headers used by headers in include/ to include/private."

PRESUBMIT.py

Index: PRESUBMIT.py
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 04ed2e060771132405647732b0d9c8986892448a..5599c316c36f2ce1ef973a1b387c34ebfc9ffb6f 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -279,10 +279,8 @@ def _CheckLGTMsForPublicAPI(input_api, output_api):
     affected_file_path = affected_file.LocalPath()
     file_path, file_ext = os.path.splitext(affected_file_path)
     # We only care about files that end in .h and are under the top-level
-    # include dir, but not include/private.
-    if (file_ext == '.h' and
-        'include' == file_path.split(os.path.sep)[0] and
-        'private' not in file_path):
+    # include dir.
+    if file_ext == '.h' and 'include' == file_path.split(os.path.sep)[0]:
       requires_owner_check = True
 
   if not requires_owner_check:
@@ -330,12 +328,8 @@ def _CheckLGTMsForPublicAPI(input_api, output_api):
   if not lgtm_from_owner:
     results.append(
         output_api.PresubmitError(
-            "If this CL adds to or changes Skia's public API, you need an LGTM "
-            "from any of %s.  If this CL only removes from or doesn't change "
-            "Skia's public API, please add a short note to your CL saying so "
-            "and add one of those reviewers on a TBR= line.  If you don't know "
-            "this CL affects Skia's public API, please treat it like it does."
-            % str(PUBLIC_API_OWNERS)))
+            'Since the CL is editing public API, you must have an LGTM from '
+            'one of: %s' % str(PUBLIC_API_OWNERS)))
   return results