diff options
Diffstat (limited to 'chrome/browser/extensions/api/management/management_api_browsertest.cc')
| -rw-r--r-- | chrome/browser/extensions/api/management/management_api_browsertest.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index 3250a3b..5ca8f4c6 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -106,9 +106,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest, const std::string id = extension->id(); // Uninstall, then cancel via the confirm dialog. - scoped_refptr<ManagementUninstallFunction> uninstall_function( - new ManagementUninstallFunction()); - ManagementUninstallFunction::SetAutoConfirmForTest(false); + scoped_refptr<UninstallFunction> uninstall_function(new UninstallFunction()); + UninstallFunction::SetAutoConfirmForTest(false); EXPECT_TRUE(MatchPattern( util::RunFunctionAndReturnError( @@ -122,8 +121,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest, EXPECT_TRUE(service->GetExtensionById(id, false) != NULL); // Uninstall, then accept via the confirm dialog. - uninstall_function = new ManagementUninstallFunction(); - ManagementUninstallFunction::SetAutoConfirmForTest(true); + uninstall_function = new UninstallFunction(); + UninstallFunction::SetAutoConfirmForTest(true); util::RunFunctionAndReturnSingleResult( uninstall_function, @@ -145,8 +144,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest, ASSERT_TRUE(listener.WaitUntilSatisfied()); // The management API should list this extension. - scoped_refptr<ManagementGetAllFunction> function = - new ManagementGetAllFunction(); + scoped_refptr<GetAllExtensionsFunction> function = + new GetAllExtensionsFunction(); scoped_ptr<base::Value> result(util::RunFunctionAndReturnSingleResult( function.get(), "[]", browser())); base::ListValue* list; @@ -156,7 +155,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest, // And it should continue to do so even after it crashes. ASSERT_TRUE(CrashEnabledExtension(extension->id())); - function = new ManagementGetAllFunction(); + function = new GetAllExtensionsFunction(); result.reset(util::RunFunctionAndReturnSingleResult( function.get(), "[]", browser())); ASSERT_TRUE(result->GetAsList(&list)); @@ -201,8 +200,7 @@ class ExtensionManagementApiEscalationTest : void SetEnabled(bool enabled, bool user_gesture, const std::string& expected_error) { - scoped_refptr<ManagementSetEnabledFunction> function( - new ManagementSetEnabledFunction); + scoped_refptr<SetEnabledFunction> function(new SetEnabledFunction); const char* enabled_string = enabled ? "true" : "false"; if (user_gesture) function->set_user_gesture(true); @@ -229,8 +227,8 @@ const char ExtensionManagementApiEscalationTest::kId[] = IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest, DisabledReason) { - scoped_refptr<ManagementGetFunction> function = - new ManagementGetFunction(); + scoped_refptr<GetExtensionByIdFunction> function = + new GetExtensionByIdFunction(); scoped_ptr<base::Value> result(util::RunFunctionAndReturnSingleResult( function.get(), base::StringPrintf("[\"%s\"]", kId), |