Upstream sqlite gyp changes for Android.

sql/connection_unittest.cc

 // 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.
 
 #include "base/file_util.h"
 #include "base/scoped_temp_dir.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "sql/meta_table.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 124 matching lines @@
   EXPECT_TRUE(db().BeginTransaction());
 }
 
 // Test that sql::Connection::Raze() results in a database without the
 // tables from the original database.
 TEST_F(SQLConnectionTest, Raze) {
   const char* kCreateSql = "CREATE TABLE foo (id INTEGER PRIMARY KEY, value)";
   ASSERT_TRUE(db().Execute(kCreateSql));
   ASSERT_TRUE(db().Execute("INSERT INTO foo (value) VALUES (12)"));
 
+  int page_count_before_raze = 0;
   {
     sql::Statement s(db().GetUniqueStatement("PRAGMA page_count"));
     ASSERT_TRUE(s.Step());
-    EXPECT_EQ(2, s.ColumnInt(0));
+    page_count_before_raze = s.ColumnInt(0);
   }
+  ASSERT_GT(page_count_before_raze, 0);
 
   {
     sql::Statement s(db().GetUniqueStatement("SELECT * FROM sqlite_master"));
     ASSERT_TRUE(s.Step());
     EXPECT_EQ("table", s.ColumnString(0));
     EXPECT_EQ("foo", s.ColumnString(1));
     EXPECT_EQ("foo", s.ColumnString(2));
-    EXPECT_EQ(2, s.ColumnInt(3));
+    EXPECT_EQ(page_count_before_raze, s.ColumnInt(3));

[Scott Hess - ex-Googler, 2012/07/27 22:23:29]

Hmm.  Maybe toss in a comment to the end of "Table foo is stored in the last
page of the file.

     EXPECT_EQ(kCreateSql, s.ColumnString(4));
   }
 
   ASSERT_TRUE(db().Raze());
 
   {
     sql::Statement s(db().GetUniqueStatement("PRAGMA page_count"));
     ASSERT_TRUE(s.Step());
-    EXPECT_EQ(1, s.ColumnInt(0));
+    EXPECT_LT(s.ColumnInt(0), page_count_before_raze);

[Scott Hess - ex-Googler, 2012/07/27 22:23:29]

And then here, add a comment that the last page of the file went away.

Since you're moving to dynamic values, maybe you should also snag the page count
before the table was created, so you can use _EQ here.  Raze() is kind of
outside-the-box, so I used very explicit values to assert that if things
changed, we'd pay really close attention to it.  Here it should have the same
page_count as a clean newly-created database.

Actually, given your changes in the gyp file, you might want to add a test that
AUTO_VACUUM retains state across the Raze().  Basically it should have the same
value before and after.

   }
 
   {
     sql::Statement s(db().GetUniqueStatement("SELECT * FROM sqlite_master"));
     ASSERT_FALSE(s.Step());
   }
 }
 
 // Test that Raze() maintains page_size.
 TEST_F(SQLConnectionTest, RazePageSize) {
@@ skipping 92 matching lines @@
   // Otherwise, sqlite3 doesn't find the correct directory to store
   // temporary files and will report the error 'unable to open
   // database file'.
   ASSERT_TRUE(meta_table.Init(&db(), 4, 4));
 }
 #endif
 
 // TODO(shess): Spin up a background thread to hold other_db, to more
 // closely match real life.  That would also allow testing
 // RazeWithTimeout().