Revert revision 176015

chrome/browser/extensions/api/management/management_api_browsertest.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/api/management/management_api.h"
@@ skipping 88 matching lines @@
       extension_service();
 
   // Install an extension.
   const Extension* extension = InstallExtension(
       test_data_dir_.AppendASCII("api_test/management/enabled_extension"), 1);
   ASSERT_TRUE(extension);
 
   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(
           uninstall_function,
           base::StringPrintf("[\"%s\", {\"showConfirmDialog\": true}]",
               id.c_str()),
           browser()),
       keys::kUninstallCanceledError));
 
   // Make sure the extension wasn't uninstalled.
   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,
       base::StringPrintf("[\"%s\", {\"showConfirmDialog\": true}]", id.c_str()),
       browser());
 
   // Make sure the extension was uninstalled.
   EXPECT_TRUE(service->GetExtensionById(id, false) == NULL);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiBrowserTest,
                        GetAllIncludesTerminated) {
   // Load an extension with a background page, so that we know it has a process
   // running.
   ExtensionTestMessageListener listener("ready", false);
   const Extension* extension = LoadExtension(
       test_data_dir_.AppendASCII("management/install_event"));
   ASSERT_TRUE(extension);
   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;
   ASSERT_TRUE(result->GetAsList(&list));
   EXPECT_EQ(1U, list->GetSize());
 
   // 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));
   EXPECT_EQ(1U, list->GetSize());
 }
 
 class ExtensionManagementApiEscalationTest :
     public ExtensionManagementApiBrowserTest {
  protected:
   // The id of the permissions escalation test extension we use.
@@ skipping 24 matching lines @@
     // Update to a high-permission version - it should get disabled.
     EXPECT_FALSE(UpdateExtension(kId, path_v2, -1));
     EXPECT_TRUE(service->GetExtensionById(kId, false) == NULL);
     EXPECT_TRUE(service->GetExtensionById(kId, true) != NULL);
     EXPECT_TRUE(
         service->extension_prefs()->DidExtensionEscalatePermissions(kId));
   }
 
   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);
     bool response = util::RunFunction(
         function.get(),
         base::StringPrintf("[\"%s\", %s]", kId, enabled_string),
         browser(),
         util::NONE);
     if (expected_error.empty()) {
       EXPECT_EQ(true, response);
     } else {
       EXPECT_TRUE(response == false);
       EXPECT_EQ(expected_error, function->GetError());
     }
   }
 
 
  private:
   base::ScopedTempDir scoped_temp_dir_;
 };
 
 const char ExtensionManagementApiEscalationTest::kId[] =
     "pgdpcfcocojkjfbgpiianjngphoopgmo";
 
 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),
       browser()));
   ASSERT_TRUE(result.get() != NULL);
   ASSERT_TRUE(result->IsType(base::Value::TYPE_DICTIONARY));
   base::DictionaryValue* dict =
       static_cast<base::DictionaryValue*>(result.get());
   std::string reason;
   EXPECT_TRUE(dict->GetStringASCII(keys::kDisabledReasonKey, &reason));
@@ skipping 19 matching lines @@
   // extension should be reloaded and enabled.
   ASSERT_TRUE(CrashEnabledExtension(kId));
   SetEnabled(false, true, "");
   SetEnabled(true, true, "");
   const Extension* extension = ExtensionSystem::Get(browser()->profile())->
       extension_service()->GetExtensionById(kId, false);
   EXPECT_TRUE(extension);
 }
 
 }  // namespace extensions