Include order check should work better for files containing uncheckable includes

PRESUBMIT_test.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.
 
 import os
 import re
 import unittest
 
 import PRESUBMIT
@@ skipping 262 matching lines @@
     mock_file_other = MockFile('something.py', contents)
     mock_input_api.files = [mock_file_cc, mock_file_h, mock_file_other]
     warnings = PRESUBMIT._CheckIncludeOrder(mock_input_api, mock_output_api)
     self.assertEqual(1, len(warnings))
     self.assertEqual(2, len(warnings[0].items))
     self.assertEqual('promptOrNotify', warnings[0].type)
 
   def testUncheckableIncludes(self):
     mock_input_api = MockInputApi()
     contents = ['#include <windows.h>',
-                '#include "b.h"'
+                '#include "b.h"',
                 '#include "a.h"']
     mock_file = MockFile('', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
         mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
+    self.assertEqual(1, len(warnings))
 
     contents = ['#include "gpu/command_buffer/gles_autogen.h"',
-                '#include "b.h"'
+                '#include "b.h"',
                 '#include "a.h"']
     mock_file = MockFile('', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
         mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
+    self.assertEqual(1, len(warnings))
 
     contents = ['#include "gl_mock_autogen.h"',
-                '#include "b.h"'
+                '#include "b.h"',
                 '#include "a.h"']
     mock_file = MockFile('', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
         mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
+    self.assertEqual(1, len(warnings))
 
     contents = ['#include "ipc/some_macros.h"',
-                '#include "b.h"'
+                '#include "b.h"',
                 '#include "a.h"']
     mock_file = MockFile('', contents)
     warnings = PRESUBMIT._CheckIncludeOrderInFile(
         mock_input_api, mock_file, range(1, len(contents) + 1))
-    self.assertEqual(0, len(warnings))
+    self.assertEqual(1, len(warnings))
 
 
 class VersionControlConflictsTest(unittest.TestCase):
   def testTypicalConflict(self):
     lines = ['<<<<<<< HEAD',
              '  base::ScopedTempDir temp_dir_;',
              '=======',
              '  ScopedTempDir temp_dir_;',
              '>>>>>>> master']
     errors = PRESUBMIT._CheckForVersionControlConflictsInFile(
@@ skipping 102 matching lines @@
       'policy/DEPS',
       'sandbox/DEPS',
       'tools/memory_watcher/DEPS',
       'third_party/lss/DEPS',
     ])
     self.assertEqual(expected, files_to_check);
 
 
 if __name__ == '__main__':
   unittest.main()