Move browsing data API functions registrations out of ExtensionFunctionRegistry

chrome/browser/extensions/api/browsing_data/browsing_data_test.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 <string>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 66 matching lines @@
             details).ptr()));
   }
 
   int GetAsMask(const base::DictionaryValue* dict, std::string path,
                 int mask_value) {
     bool result;
     EXPECT_TRUE(dict->GetBoolean(path, &result)) << "for " << path;
     return result ? mask_value : 0;
   }
 
-  void RunRemoveBrowsingDataFunctionAndCompareRemovalMask(
+  void RunBrowsingDataRemoveFunctionAndCompareRemovalMask(
       const std::string& data_types,
       int expected_mask) {
-    scoped_refptr<RemoveBrowsingDataFunction> function =
-        new RemoveBrowsingDataFunction();
+    scoped_refptr<BrowsingDataRemoveFunction> function =
+        new BrowsingDataRemoveFunction();
     SCOPED_TRACE(data_types);
     EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
         function.get(),
         std::string("[{\"since\": 1},") + data_types + "]",
         browser()));
     EXPECT_EQ(expected_mask, GetRemovalMask());
     EXPECT_EQ(UNPROTECTED_WEB, GetOriginSetMask());
   }
 
-  void RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  void RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       const std::string& key,
       int expected_mask) {
-    RunRemoveBrowsingDataFunctionAndCompareRemovalMask(
+    RunBrowsingDataRemoveFunctionAndCompareRemovalMask(
         std::string("{\"") + key + "\": true}", expected_mask);
   }
 
-  void RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  void RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       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(),
         "[{\"originTypes\": " + protectedStr + "}, {\"cookies\": true}]",
         browser()));
     EXPECT_EQ(expected_mask, GetOriginSetMask());
   }
 
   template<class ShortcutFunction>
   void RunAndCompareRemovalMask(int expected_mask) {
@@ skipping 108 matching lines @@
                        GetAsMask(data_to_remove, "webSQL",
                                  BrowsingDataRemover::REMOVE_WEBSQL) |
                        GetAsMask(data_to_remove, "serverBoundCertificates",
                            BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS);
     EXPECT_EQ(expected_removal_mask, removal_mask);
   }
 
   // The kAllowDeletingBrowserHistory pref must be set to false before this
   // is called.
   void CheckRemovalPermitted(const std::string& data_types, bool permitted) {
-    scoped_refptr<RemoveBrowsingDataFunction> function =
-        new RemoveBrowsingDataFunction();
+    scoped_refptr<BrowsingDataRemoveFunction> function =
+        new BrowsingDataRemoveFunction();
     std::string args = "[{\"since\": 1}," + data_types + "]";
 
     if (permitted) {
       EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
         function.get(), args, browser())) << " for " << args;
     } else {
       EXPECT_TRUE(MatchPattern(
           RunFunctionAndReturnError(function.get(), args, browser()),
           extension_browsing_data_api_constants::kDeleteProhibitedError))
           << " for " << args;
     }
   }
 
  private:
   scoped_ptr<BrowsingDataRemover::NotificationDetails> called_with_details_;
   content::NotificationRegistrar registrar_;
 };
 
 }  // namespace
 
 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.get(), kRemoveEverythingArguments, browser()),
                    extension_browsing_data_api_constants::kOneAtATimeError));
   BrowsingDataRemover::set_removing(false);
 
   EXPECT_EQ(base::Time(), GetBeginTime());
   EXPECT_EQ(-1, GetRemovalMask());
 }
 
@@ skipping 21 matching lines @@
   // If a prohibited type is not selected, the removal is OK.
   CheckRemovalPermitted("{\"history\": false}", true);
   CheckRemovalPermitted("{\"downloads\": false}", true);
   CheckRemovalPermitted("{\"cache\": true, \"history\": false}", true);
   CheckRemovalPermitted("{\"cookies\": true, \"downloads\": false}", true);
 }
 
 // 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()));
 
   EXPECT_EQ(base::Time::FromDoubleT(1.0), GetBeginTime());
   EXPECT_EQ((BrowsingDataRemover::REMOVE_SITE_DATA |
       BrowsingDataRemover::REMOVE_CACHE |
       BrowsingDataRemover::REMOVE_DOWNLOADS |
       BrowsingDataRemover::REMOVE_FORM_DATA |
       BrowsingDataRemover::REMOVE_HISTORY |
       BrowsingDataRemover::REMOVE_PASSWORDS) &
       // We can't remove plugin data inside a test profile.
       ~BrowsingDataRemover::REMOVE_PLUGIN_DATA, GetRemovalMask());
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, BrowsingDataOriginSetMask) {
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask("{}", 0);
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask("{}", 0);
 
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       "{\"unprotectedWeb\": true}", UNPROTECTED_WEB);
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       "{\"protectedWeb\": true}", PROTECTED_WEB);
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       "{\"extension\": true}", EXTENSION);
 
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       "{\"unprotectedWeb\": true, \"protectedWeb\": true}",
       UNPROTECTED_WEB | PROTECTED_WEB);
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       "{\"unprotectedWeb\": true, \"extension\": true}",
       UNPROTECTED_WEB | EXTENSION);
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       "{\"protectedWeb\": true, \"extension\": true}",
       PROTECTED_WEB | EXTENSION);
 
-  RunRemoveBrowsingDataFunctionAndCompareOriginSetMask(
+  RunBrowsingDataRemoveFunctionAndCompareOriginSetMask(
       ("{\"unprotectedWeb\": true, \"protectedWeb\": true, "
        "\"extension\": true}"),
       UNPROTECTED_WEB | PROTECTED_WEB | EXTENSION);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        FLAKY_BrowsingDataRemovalMask) {
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "appcache", BrowsingDataRemover::REMOVE_APPCACHE);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "cache", BrowsingDataRemover::REMOVE_CACHE);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "cookies", BrowsingDataRemover::REMOVE_COOKIES);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "downloads", BrowsingDataRemover::REMOVE_DOWNLOADS);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "fileSystems", BrowsingDataRemover::REMOVE_FILE_SYSTEMS);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "formData", BrowsingDataRemover::REMOVE_FORM_DATA);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "history", BrowsingDataRemover::REMOVE_HISTORY);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "indexedDB", BrowsingDataRemover::REMOVE_INDEXEDDB);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "localStorage", BrowsingDataRemover::REMOVE_LOCAL_STORAGE);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "serverBoundCertificates",
       BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS);
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "passwords", BrowsingDataRemover::REMOVE_PASSWORDS);
   // We can't remove plugin data inside a test profile.
-  RunRemoveBrowsingDataWithKeyAndCompareRemovalMask(
+  RunBrowsingDataRemoveWithKeyAndCompareRemovalMask(
       "webSQL", BrowsingDataRemover::REMOVE_WEBSQL);
 }
 
 // Test an arbitrary combination of data types.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalMaskCombination) {
-  RunRemoveBrowsingDataFunctionAndCompareRemovalMask(
+  RunBrowsingDataRemoveFunctionAndCompareRemovalMask(
        "{\"appcache\": true, \"cookies\": true, \"history\": true}",
        BrowsingDataRemover::REMOVE_APPCACHE |
            BrowsingDataRemover::REMOVE_COOKIES |
            BrowsingDataRemover::REMOVE_HISTORY);
 }
 
 // Make sure the remove() function accepts the format produced by settings().
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest,
                        BrowsingDataRemovalInputFromSettings) {
   PrefService* prefs = browser()->profile()->GetPrefs();
@@ skipping 19 matching lines @@
 
     base::DictionaryValue* result;
     EXPECT_TRUE(result_value->GetAsDictionary(&result));
     base::DictionaryValue* data_to_remove;
     EXPECT_TRUE(result->GetDictionary("dataToRemove", &data_to_remove));
 
     JSONStringValueSerializer serializer(&json);
     EXPECT_TRUE(serializer.Serialize(*data_to_remove));
   }
   {
-    scoped_refptr<RemoveBrowsingDataFunction> remove_function =
-        new RemoveBrowsingDataFunction();
+    scoped_refptr<BrowsingDataRemoveFunction> remove_function =
+        new BrowsingDataRemoveFunction();
     SCOPED_TRACE("remove_json");
     EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(
         remove_function.get(),
         std::string("[{\"since\": 1},") + json + "]",
         browser()));
     EXPECT_EQ(expected_mask, GetRemovalMask());
     EXPECT_EQ(UNPROTECTED_WEB, GetOriginSetMask());
   }
 }
 
 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);
 }
 
 // Test the processing of the 'delete since' preference.
 IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, SettingsFunctionSince) {
   SetSinceAndVerify(BrowsingDataRemover::EVERYTHING);
   SetSinceAndVerify(BrowsingDataRemover::LAST_HOUR);
   SetSinceAndVerify(BrowsingDataRemover::LAST_DAY);
   SetSinceAndVerify(BrowsingDataRemover::LAST_WEEK);
   SetSinceAndVerify(BrowsingDataRemover::FOUR_WEEKS);
@@ skipping 48 matching lines @@
 
   SetPrefsAndVerifySettings(
       BrowsingDataRemover::REMOVE_COOKIES |
           BrowsingDataRemover::REMOVE_HISTORY |
           BrowsingDataRemover::REMOVE_DOWNLOADS,
     UNPROTECTED_WEB,
     site_data_no_plugins |
         BrowsingDataRemover::REMOVE_HISTORY |
         BrowsingDataRemover::REMOVE_DOWNLOADS);
 }