| Index: chrome/browser/browsing_data_indexed_db_helper_unittest.cc
|
| diff --git a/chrome/browser/browsing_data_indexed_db_helper_unittest.cc b/chrome/browser/browsing_data_indexed_db_helper_unittest.cc
|
| index 8473a571f4c620bd3c7931b7de9c73aae7d5b80b..4064ac48d2867640ba0027f66b9793c3788501af 100644
|
| --- a/chrome/browser/browsing_data_indexed_db_helper_unittest.cc
|
| +++ b/chrome/browser/browsing_data_indexed_db_helper_unittest.cc
|
| @@ -7,91 +7,9 @@
|
| #include "base/utf_string_conversions.h"
|
| #include "chrome/browser/browsing_data_indexed_db_helper.h"
|
| #include "chrome/test/testing_profile.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
|
|
|
| namespace {
|
|
|
| -class TestCompletionCallback {
|
| - public:
|
| - TestCompletionCallback() : has_result_(false) {}
|
| -
|
| - bool has_result() const { return has_result_; }
|
| -
|
| - const std::vector<BrowsingDataIndexedDBHelper::IndexedDBInfo>& result() {
|
| - return result_;
|
| - }
|
| -
|
| - void callback(
|
| - const std::vector<BrowsingDataIndexedDBHelper::IndexedDBInfo>& info) {
|
| - has_result_ = true;
|
| - result_ = info;
|
| - }
|
| -
|
| - private:
|
| - bool has_result_;
|
| - std::vector<BrowsingDataIndexedDBHelper::IndexedDBInfo> result_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(TestCompletionCallback);
|
| -};
|
| -
|
| -// Functionality incomplete, needs further refactoring, http://crbug.com/60532.
|
| -TEST(CannedBrowsingDataIndexedDBHelperTest, DISABLED_AddIndexedDB) {
|
| - TestingProfile profile;
|
| -
|
| - const GURL origin1("http://host1:1/");
|
| - const GURL origin2("http://host2:1/");
|
| - const string16 description(ASCIIToUTF16("description"));
|
| - const FilePath::CharType file1[] =
|
| - FILE_PATH_LITERAL("http_host1_1.indexeddb");
|
| - const FilePath::CharType file2[] =
|
| - FILE_PATH_LITERAL("http_host2_1.indexeddb");
|
| -
|
| - scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
|
| - new CannedBrowsingDataIndexedDBHelper(&profile));
|
| - helper->AddIndexedDB(origin1, description);
|
| - helper->AddIndexedDB(origin2, description);
|
| -
|
| - TestCompletionCallback callback;
|
| - helper->StartFetching(
|
| - NewCallback(&callback, &TestCompletionCallback::callback));
|
| - ASSERT_TRUE(callback.has_result());
|
| -
|
| - std::vector<BrowsingDataIndexedDBHelper::IndexedDBInfo> result =
|
| - callback.result();
|
| -
|
| - ASSERT_EQ(2U, result.size());
|
| - EXPECT_EQ(FilePath(file1).value(), result[0].file_path.BaseName().value());
|
| - EXPECT_EQ(FilePath(file2).value(), result[1].file_path.BaseName().value());
|
| -}
|
| -
|
| -// Functionality incomplete, needs further refactoring, http://crbug.com/60532.
|
| -TEST(CannedBrowsingDataIndexedDBHelperTest, DISABLED_Unique) {
|
| - TestingProfile profile;
|
| -
|
| - const GURL origin("http://host1:1/");
|
| - const string16 description(ASCIIToUTF16("description"));
|
| - const FilePath::CharType file[] =
|
| - FILE_PATH_LITERAL("http_host1_1.indexeddb");
|
| -
|
| - scoped_refptr<CannedBrowsingDataIndexedDBHelper> helper(
|
| - new CannedBrowsingDataIndexedDBHelper(&profile));
|
| - helper->AddIndexedDB(origin, description);
|
| - helper->AddIndexedDB(origin, description);
|
| -
|
| - TestCompletionCallback callback;
|
| - helper->StartFetching(
|
| - NewCallback(&callback, &TestCompletionCallback::callback));
|
| - ASSERT_TRUE(callback.has_result());
|
| -
|
| - std::vector<BrowsingDataIndexedDBHelper::IndexedDBInfo> result =
|
| - callback.result();
|
| -
|
| - ASSERT_EQ(1U, result.size());
|
| - EXPECT_EQ(FilePath(file).value(), result[0].file_path.BaseName().value());
|
| -}
|
| -
|
| TEST(CannedBrowsingDataIndexedDBHelperTest, Empty) {
|
| TestingProfile profile;
|
|
|
|
|