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

Unified Diff: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

Issue 12089062: Move API functions registrations out of ExtensionFunctionRegistry. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 11 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/extensions/api/browsing_data/browsing_data_test.cc
===================================================================
--- chrome/browser/extensions/api/browsing_data/browsing_data_test.cc (revision 179687)
+++ chrome/browser/extensions/api/browsing_data/browsing_data_test.cc (working copy)
@@ -71,8 +71,8 @@
void RunRemoveBrowsingDataFunctionAndCompareRemovalMask(
const std::string& key,
int expected_mask) {
- scoped_refptr<RemoveBrowsingDataFunction> function =
- new RemoveBrowsingDataFunction();
+ scoped_refptr<BrowsingDataRemoveFunction> function =
+ new BrowsingDataRemoveFunction();
SCOPED_TRACE(key);
EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
function.get(),
@@ -85,8 +85,8 @@
void RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
const std::string& protectedStr,
int expected_mask) {
- scoped_refptr<RemoveBrowsingDataFunction> function =
- new RemoveBrowsingDataFunction();
+ scoped_refptr<BrowsingDataRemoveFunction> function =
+ new BrowsingDataRemoveFunction();
SCOPED_TRACE(protectedStr);
EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
function.get(),
@@ -117,8 +117,8 @@
IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, OneAtATime) {
BrowsingDataRemover::set_removing(true);
- scoped_refptr<RemoveBrowsingDataFunction> function =
- new RemoveBrowsingDataFunction();
+ scoped_refptr<BrowsingDataRemoveFunction> function =
+ new BrowsingDataRemoveFunction();
EXPECT_TRUE(MatchPattern(
RunFunctionAndReturnError(function,
kRemoveEverythingArguments,
@@ -133,8 +133,8 @@
// Use-after-free, see http://crbug.com/116522
IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
DISABLED_RemoveBrowsingDataAll) {
- scoped_refptr<RemoveBrowsingDataFunction> function =
- new RemoveBrowsingDataFunction();
+ scoped_refptr<BrowsingDataRemoveFunction> function =
+ new BrowsingDataRemoveFunction();
EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(function.get(),
kRemoveEverythingArguments,
browser()));
@@ -207,29 +207,29 @@
}
IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, ShortcutFunctionRemovalMask) {
- RunAndCompareRemovalMask<RemoveAppCacheFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveAppcacheFunction>(
BrowsingDataRemover::REMOVE_APPCACHE);
- RunAndCompareRemovalMask<RemoveCacheFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveCacheFunction>(
BrowsingDataRemover::REMOVE_CACHE);
- RunAndCompareRemovalMask<RemoveCookiesFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveCookiesFunction>(
BrowsingDataRemover::REMOVE_COOKIES |
BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS);
- RunAndCompareRemovalMask<RemoveDownloadsFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveDownloadsFunction>(
BrowsingDataRemover::REMOVE_DOWNLOADS);
- RunAndCompareRemovalMask<RemoveFileSystemsFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveFileSystemsFunction>(
BrowsingDataRemover::REMOVE_FILE_SYSTEMS);
- RunAndCompareRemovalMask<RemoveFormDataFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveFormDataFunction>(
BrowsingDataRemover::REMOVE_FORM_DATA);
- RunAndCompareRemovalMask<RemoveHistoryFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveHistoryFunction>(
BrowsingDataRemover::REMOVE_HISTORY);
- RunAndCompareRemovalMask<RemoveIndexedDBFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveIndexedDBFunction>(
BrowsingDataRemover::REMOVE_INDEXEDDB);
- RunAndCompareRemovalMask<RemoveLocalStorageFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveLocalStorageFunction>(
BrowsingDataRemover::REMOVE_LOCAL_STORAGE);
// We can't remove plugin data inside a test profile.
- RunAndCompareRemovalMask<RemovePasswordsFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemovePasswordsFunction>(
BrowsingDataRemover::REMOVE_PASSWORDS);
- RunAndCompareRemovalMask<RemoveWebSQLFunction>(
+ RunAndCompareRemovalMask<BrowsingDataRemoveWebSQLFunction>(
BrowsingDataRemover::REMOVE_WEBSQL);
}

Powered by Google App Engine
This is Rietveld 408576698