Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(373)

Unified Diff: chrome/browser/browsing_data_database_helper_browsertest.cc

Issue 10805015: Move browsing_data_helper files into a separate directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix chrome_frame build Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/browsing_data_database_helper_browsertest.cc
diff --git a/chrome/browser/browsing_data_database_helper_browsertest.cc b/chrome/browser/browsing_data_database_helper_browsertest.cc
deleted file mode 100644
index eacbc11e0d7b845e71b4475c4d71a6c1a3261ac8..0000000000000000000000000000000000000000
--- a/chrome/browser/browsing_data_database_helper_browsertest.cc
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (c) 2011 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/bind.h"
-#include "base/bind_helpers.h"
-#include "base/file_util.h"
-#include "base/utf_string_conversions.h"
-#include "chrome/browser/browsing_data_database_helper.h"
-#include "chrome/browser/browsing_data_helper_browsertest.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/ui_test_utils.h"
-#include "content/public/test/test_browser_thread.h"
-
-using content::BrowserContext;
-using content::BrowserThread;
-
-namespace {
-typedef BrowsingDataHelperCallback<BrowsingDataDatabaseHelper::DatabaseInfo>
- TestCompletionCallback;
-
-const char kTestIdentifier1[] = "http_www.google.com_0";
-
-const char kTestIdentifierExtension[] =
- "chrome-extension_behllobkkfkfnphdnhnkndlbkcpglgmj_0";
-
-class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
- public:
- virtual void CreateDatabases() {
- webkit_database::DatabaseTracker* db_tracker =
- BrowserContext::GetDatabaseTracker(browser()->profile());
- string16 db_name = ASCIIToUTF16("db");
- string16 description = ASCIIToUTF16("db_description");
- int64 size;
- string16 identifier1(UTF8ToUTF16(kTestIdentifier1));
- db_tracker->DatabaseOpened(identifier1, db_name, description, 1, &size);
- db_tracker->DatabaseClosed(identifier1, db_name);
- FilePath db_path1 = db_tracker->GetFullDBFilePath(identifier1, db_name);
- file_util::CreateDirectory(db_path1.DirName());
- ASSERT_EQ(0, file_util::WriteFile(db_path1, NULL, 0));
- string16 identifierExtension(UTF8ToUTF16(kTestIdentifierExtension));
- db_tracker->DatabaseOpened(identifierExtension, db_name, description, 1,
- &size);
- db_tracker->DatabaseClosed(identifierExtension, db_name);
- FilePath db_path2 =
- db_tracker->GetFullDBFilePath(identifierExtension, db_name);
- file_util::CreateDirectory(db_path2.DirName());
- ASSERT_EQ(0, file_util::WriteFile(db_path2, NULL, 0));
- std::vector<webkit_database::OriginInfo> origins;
- db_tracker->GetAllOriginsInfo(&origins);
- ASSERT_EQ(2U, origins.size());
- }
-};
-
-// Called back by BrowsingDataDatabaseHelper on the UI thread once the database
-// information has been retrieved.
-class StopTestOnCallback {
- public:
- explicit StopTestOnCallback(
- BrowsingDataDatabaseHelper* database_helper)
- : database_helper_(database_helper) {
- DCHECK(database_helper_);
- }
-
- void Callback(const std::list<BrowsingDataDatabaseHelper::DatabaseInfo>&
- database_info_list) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- ASSERT_EQ(1UL, database_info_list.size());
- EXPECT_EQ(std::string(kTestIdentifier1),
- database_info_list.begin()->origin_identifier);
- MessageLoop::current()->Quit();
- }
-
- private:
- BrowsingDataDatabaseHelper* database_helper_;
-};
-
-// Flaky on Win/Mac/Linux: http://crbug.com/92460
-IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, DISABLED_FetchData) {
- CreateDatabases();
- scoped_refptr<BrowsingDataDatabaseHelper> database_helper(
- new BrowsingDataDatabaseHelper(browser()->profile()));
- StopTestOnCallback stop_test_on_callback(database_helper);
- database_helper->StartFetching(
- base::Bind(&StopTestOnCallback::Callback,
- base::Unretained(&stop_test_on_callback)));
- // Blocks until StopTestOnCallback::Callback is notified.
- ui_test_utils::RunMessageLoop();
-}
-
-IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedAddDatabase) {
- const GURL origin1("http://host1:1/");
- const GURL origin2("http://host2:1/");
- const char origin_str1[] = "http_host1_1";
- const char origin_str2[] = "http_host2_1";
- const char db1[] = "db1";
- const char db2[] = "db2";
- const char db3[] = "db3";
-
- scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
- new CannedBrowsingDataDatabaseHelper(browser()->profile()));
- helper->AddDatabase(origin1, db1, "");
- helper->AddDatabase(origin1, db2, "");
- helper->AddDatabase(origin2, db3, "");
-
- TestCompletionCallback callback;
- helper->StartFetching(
- base::Bind(&TestCompletionCallback::callback,
- base::Unretained(&callback)));
-
- std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
- callback.result();
-
- ASSERT_EQ(3u, result.size());
- std::list<BrowsingDataDatabaseHelper::DatabaseInfo>::iterator info =
- result.begin();
- EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
- EXPECT_STREQ(db1, info->database_name.c_str());
- info++;
- EXPECT_STREQ(origin_str1, info->origin_identifier.c_str());
- EXPECT_STREQ(db2, info->database_name.c_str());
- info++;
- EXPECT_STREQ(origin_str2, info->origin_identifier.c_str());
- EXPECT_STREQ(db3, info->database_name.c_str());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowsingDataDatabaseHelperTest, CannedUnique) {
- const GURL origin("http://host1:1/");
- const char origin_str[] = "http_host1_1";
- const char db[] = "db1";
-
- scoped_refptr<CannedBrowsingDataDatabaseHelper> helper(
- new CannedBrowsingDataDatabaseHelper(browser()->profile()));
- helper->AddDatabase(origin, db, "");
- helper->AddDatabase(origin, db, "");
-
- TestCompletionCallback callback;
- helper->StartFetching(
- base::Bind(&TestCompletionCallback::callback,
- base::Unretained(&callback)));
-
- std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
- callback.result();
-
- ASSERT_EQ(1u, result.size());
- EXPECT_STREQ(origin_str, result.begin()->origin_identifier.c_str());
- EXPECT_STREQ(db, result.begin()->database_name.c_str());
-}
-} // namespace
« no previous file with comments | « chrome/browser/browsing_data_database_helper.cc ('k') | chrome/browser/browsing_data_database_helper_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698