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

Unified Diff: chrome/browser/extensions/api/management/management_api_browsertest.cc

Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ms release build 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/management/management_api_browsertest.cc
diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc
index 5ca8f4c64f3155411d28ed9c4660c873a49ff695..3250a3b29e5f0ac3670230a335e165c7736a1d32 100644
--- a/chrome/browser/extensions/api/management/management_api_browsertest.cc
+++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc
@@ -106,8 +106,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
const std::string id = extension->id();
// Uninstall, then cancel via the confirm dialog.
- scoped_refptr<UninstallFunction> uninstall_function(new UninstallFunction());
- UninstallFunction::SetAutoConfirmForTest(false);
+ scoped_refptr<ManagementUninstallFunction> uninstall_function(
+ new ManagementUninstallFunction());
+ ManagementUninstallFunction::SetAutoConfirmForTest(false);
EXPECT_TRUE(MatchPattern(
util::RunFunctionAndReturnError(
@@ -121,8 +122,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
EXPECT_TRUE(service->GetExtensionById(id, false) != NULL);
// Uninstall, then accept via the confirm dialog.
- uninstall_function = new UninstallFunction();
- UninstallFunction::SetAutoConfirmForTest(true);
+ uninstall_function = new ManagementUninstallFunction();
+ ManagementUninstallFunction::SetAutoConfirmForTest(true);
util::RunFunctionAndReturnSingleResult(
uninstall_function,
@@ -144,8 +145,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
ASSERT_TRUE(listener.WaitUntilSatisfied());
// The management API should list this extension.
- scoped_refptr<GetAllExtensionsFunction> function =
- new GetAllExtensionsFunction();
+ scoped_refptr<ManagementGetAllFunction> function =
+ new ManagementGetAllFunction();
scoped_ptr<base::Value> result(util::RunFunctionAndReturnSingleResult(
function.get(), "[]", browser()));
base::ListValue* list;
@@ -155,7 +156,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 GetAllExtensionsFunction();
+ function = new ManagementGetAllFunction();
result.reset(util::RunFunctionAndReturnSingleResult(
function.get(), "[]", browser()));
ASSERT_TRUE(result->GetAsList(&list));
@@ -200,7 +201,8 @@ class ExtensionManagementApiEscalationTest :
void SetEnabled(bool enabled, bool user_gesture,
const std::string& expected_error) {
- scoped_refptr<SetEnabledFunction> function(new SetEnabledFunction);
+ scoped_refptr<ManagementSetEnabledFunction> function(
+ new ManagementSetEnabledFunction);
const char* enabled_string = enabled ? "true" : "false";
if (user_gesture)
function->set_user_gesture(true);
@@ -227,8 +229,8 @@ const char ExtensionManagementApiEscalationTest::kId[] =
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
DisabledReason) {
- scoped_refptr<GetExtensionByIdFunction> function =
- new GetExtensionByIdFunction();
+ scoped_refptr<ManagementGetFunction> function =
+ new ManagementGetFunction();
scoped_ptr<base::Value> result(util::RunFunctionAndReturnSingleResult(
function.get(),
base::StringPrintf("[\"%s\"]", kId),

Powered by Google App Engine
This is Rietveld 408576698