Revert 262747 "Improve GN public header file checking"

trunk/src/tools/gn/c_include_iterator_unittest.cc

Index: trunk/src/tools/gn/c_include_iterator_unittest.cc
===================================================================
--- trunk/src/tools/gn/c_include_iterator_unittest.cc	(revision 262754)
+++ trunk/src/tools/gn/c_include_iterator_unittest.cc	(working copy)
@@ -4,21 +4,7 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "tools/gn/c_include_iterator.h"
-#include "tools/gn/input_file.h"
-#include "tools/gn/location.h"
 
-namespace {
-
-bool RangeIs(const LocationRange& range,
-             int line, int begin_char, int end_char) {
-  return range.begin().line_number() == line &&
-         range.end().line_number() == line &&
-         range.begin().char_offset() == begin_char &&
-         range.end().char_offset() == end_char;
-}
-
-}  // namespace
-
 TEST(CIncludeIterator, Basic) {
   std::string buffer;
   buffer.append("// Some comment\n");
@@ -33,30 +19,18 @@
   buffer.append("\n");
   buffer.append("void SomeCode() {\n");
 
-  InputFile file(SourceFile("//foo.cc"));
-  file.SetContents(buffer);
+  CIncludeIterator iter(buffer);
 
-  CIncludeIterator iter(&file);
-
   base::StringPiece contents;
-  LocationRange range;
-  EXPECT_TRUE(iter.GetNextIncludeString(&contents, &range));
+  EXPECT_TRUE(iter.GetNextIncludeString(&contents));
   EXPECT_EQ("foo/bar.h", contents);
-  EXPECT_TRUE(RangeIs(range, 3, 11, 20)) << range.begin().Describe(true);
-
-  EXPECT_TRUE(iter.GetNextIncludeString(&contents, &range));
+  EXPECT_TRUE(iter.GetNextIncludeString(&contents));
   EXPECT_EQ("foo/baz.h", contents);
-  EXPECT_TRUE(RangeIs(range, 7, 12, 21)) << range.begin().Describe(true);
-
-  EXPECT_TRUE(iter.GetNextIncludeString(&contents, &range));
+  EXPECT_TRUE(iter.GetNextIncludeString(&contents));
   EXPECT_EQ("la/deda.h", contents);
-  EXPECT_TRUE(RangeIs(range, 8, 11, 20)) << range.begin().Describe(true);
-
-  EXPECT_TRUE(iter.GetNextIncludeString(&contents, &range));
+  EXPECT_TRUE(iter.GetNextIncludeString(&contents));
   EXPECT_EQ("weird_mac_import.h", contents);
-  EXPECT_TRUE(RangeIs(range, 9, 10, 28)) << range.begin().Describe(true);
-
-  EXPECT_FALSE(iter.GetNextIncludeString(&contents, &range));
+  EXPECT_FALSE(iter.GetNextIncludeString(&contents));
 }
 
 // Tests that we don't search for includes indefinitely.
@@ -66,14 +40,10 @@
     buffer.append("x\n");
   buffer.append("#include \"foo/bar.h\"\n");
 
-  InputFile file(SourceFile("//foo.cc"));
-  file.SetContents(buffer);
-
   base::StringPiece contents;
-  LocationRange range;
 
-  CIncludeIterator iter(&file);
-  EXPECT_FALSE(iter.GetNextIncludeString(&contents, &range));
+  CIncludeIterator iter(buffer);
+  EXPECT_FALSE(iter.GetNextIncludeString(&contents));
   EXPECT_TRUE(contents.empty());
 }
 
@@ -88,14 +58,10 @@
     buffer.append("#preproc\n");
   buffer.append("#include \"foo/bar.h\"\n");
 
-  InputFile file(SourceFile("//foo.cc"));
-  file.SetContents(buffer);
-
   base::StringPiece contents;
-  LocationRange range;
 
-  CIncludeIterator iter(&file);
-  EXPECT_TRUE(iter.GetNextIncludeString(&contents, &range));
+  CIncludeIterator iter(buffer);
+  EXPECT_TRUE(iter.GetNextIncludeString(&contents));
   EXPECT_EQ("foo/bar.h", contents);
 }
 
@@ -115,16 +81,12 @@
     buffer.append("#include \"" + include + "\"\n");
   }
 
-  InputFile file(SourceFile("//foo.cc"));
-  file.SetContents(buffer);
-
   base::StringPiece contents;
-  LocationRange range;
 
-  CIncludeIterator iter(&file);
+  CIncludeIterator iter(buffer);
   for (size_t group = 0; group < kGroupCount; group++) {
-    EXPECT_TRUE(iter.GetNextIncludeString(&contents, &range));
+    EXPECT_TRUE(iter.GetNextIncludeString(&contents));
     EXPECT_EQ(include, contents.as_string());
   }
-  EXPECT_FALSE(iter.GetNextIncludeString(&contents, &range));
+  EXPECT_FALSE(iter.GetNextIncludeString(&contents));
 }