Move 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 "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 53 matching lines @@
     // We're not taking ownership of the details object, but storing a copy of
     // it locally.
     called_with_details_.reset(new BrowsingDataRemover::NotificationDetails(
         *content::Details<BrowsingDataRemover::NotificationDetails>(
             details).ptr()));
   }
 
   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(),
         std::string("[{\"since\": 1}, {\"") + key + "\": true}]",
         browser()));
     EXPECT_EQ(expected_mask, GetRemovalMask());
     EXPECT_EQ(BrowsingDataHelper::UNPROTECTED_WEB, GetOriginSetMask());
   }
 
   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(),
         "[{\"originTypes\": " + protectedStr + "}, {\"cookies\": true}]",
         browser()));
     EXPECT_EQ(expected_mask, GetOriginSetMask());
   }
 
   template<class ShortcutFunction>
   void RunAndCompareRemovalMask(int expected_mask) {
@@ skipping 10 matching lines @@
 
  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,
                                 kRemoveEverythingArguments,
                                 browser()),
       extension_browsing_data_api_constants::kOneAtATimeError));
   BrowsingDataRemover::set_removing(false);
 
   EXPECT_EQ(base::Time(), GetBeginTime());
   EXPECT_EQ(-1, GetRemovalMask());
 }
 
 // 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 |
@@ skipping 52 matching lines @@
       "serverBoundCertificates",
       BrowsingDataRemover::REMOVE_SERVER_BOUND_CERTS);
   RunRemoveBrowsingDataFunctionAndCompareRemovalMask(
       "passwords", BrowsingDataRemover::REMOVE_PASSWORDS);
   // We can't remove plugin data inside a test profile.
   RunRemoveBrowsingDataFunctionAndCompareRemovalMask(
       "webSQL", BrowsingDataRemover::REMOVE_WEBSQL);
 }
 
 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);
 }