Only wait for CancelAllRequests done if the post task succeeds

chrome/browser/history/android/sqlite_cursor_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 "chrome/browser/history/android/sqlite_cursor.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 179 matching lines @@
       HistoryAndBookmarkRow::GetAndroidName(HistoryAndBookmarkRow::URL));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::LAST_VISIT_TIME));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::VISIT_COUNT));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::FAVICON));
 
   FaviconService* favicon_service = new FaviconService(hs_);
 
-  // Wraps cursor in a block, so the destructor will be called after that.
-  {
-    SQLiteCursor cursor(column_names, statement, service_.get(),
-                        favicon_service);
-    cursor.set_test_observer(this);
-    JNIEnv* env = base::android::AttachCurrentThread();
-    EXPECT_EQ(1, cursor.GetCount(env, NULL));
-    EXPECT_EQ(0, cursor.MoveTo(env, NULL, 0));
-    EXPECT_EQ(row.url().spec(), base::android::ConvertJavaStringToUTF8(
-        cursor.GetString(env, NULL, 0)).c_str());
-    EXPECT_EQ(history::ToDatabaseTime(row.last_visit_time()),
-              cursor.GetLong(env, NULL, 1));
-    EXPECT_EQ(row.visit_count(), cursor.GetInt(env, NULL, 2));
-    base::android::ScopedJavaLocalRef<jbyteArray> data =
-        cursor.GetBlob(env, NULL, 3);
-    std::vector<uint8> out;
-    base::android::JavaByteArrayToByteVector(env, data.obj(), &out);
-    EXPECT_EQ(data_bytes->data().size(), out.size());
-    EXPECT_EQ(data_bytes->data()[0], out[0]);
-  }
-
-  // Cursor's destructor post the task in UI thread, run Message loop to release
-  // the statement etc.
+  SQLiteCursor* cursor = new SQLiteCursor(column_names, statement,
+      service_.get(), favicon_service);
+  cursor->set_test_observer(this);
+  JNIEnv* env = base::android::AttachCurrentThread();
+  EXPECT_EQ(1, cursor->GetCount(env, NULL));
+  EXPECT_EQ(0, cursor->MoveTo(env, NULL, 0));
+  EXPECT_EQ(row.url().spec(), base::android::ConvertJavaStringToUTF8(
+      cursor->GetString(env, NULL, 0)).c_str());
+  EXPECT_EQ(history::ToDatabaseTime(row.last_visit_time()),
+      cursor->GetLong(env, NULL, 1));
+  EXPECT_EQ(row.visit_count(), cursor->GetInt(env, NULL, 2));
+  base::android::ScopedJavaLocalRef<jbyteArray> data =
+      cursor->GetBlob(env, NULL, 3);
+  std::vector<uint8> out;
+  base::android::JavaByteArrayToByteVector(env, data.obj(), &out);
+  EXPECT_EQ(data_bytes->data().size(), out.size());
+  EXPECT_EQ(data_bytes->data()[0], out[0]);
+  cursor->Destroy(env, NULL);
+  // Cursor::Destroy posts the task in UI thread, run Message loop to release
+  // the statement, delete SQLiteCursor itself etc.
   content::RunAllPendingInMessageLoop();
 }