| Index: chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc b/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
|
| index f76424c4e4a734f8aa9ad6e0af9b9c8be7018b1f..ffd931ae3b766f92f084ad95ea7634ed8fd0ccb5 100644
|
| --- a/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
|
| +++ b/chrome/browser/extensions/api/developer_private/developer_private_apitest.cc
|
| @@ -2,49 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include <map>
|
| -
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| -#include "chrome/common/chrome_switches.h"
|
| -
|
| -using extensions::Extension;
|
| -using extensions::Manifest;
|
| -
|
| -class DeveloperPrivateApiTest : public ExtensionApiTest {
|
| - public:
|
| - virtual void LoadExtensions() {
|
| - base::FilePath base_dir = test_data_dir_.AppendASCII("developer");
|
| - LoadNamedExtension(base_dir, "hosted_app");
|
| - }
|
| -
|
| - protected:
|
| - void LoadNamedExtension(const base::FilePath& path,
|
| - const std::string& name) {
|
| - const Extension* extension = LoadExtension(path.AppendASCII(name));
|
| - ASSERT_TRUE(extension);
|
| - extension_name_to_ids_[name] = extension->id();
|
| - }
|
|
|
| - void InstallNamedExtension(const base::FilePath& path,
|
| - const std::string& name,
|
| - Manifest::Location install_source) {
|
| - const Extension* extension = InstallExtension(path.AppendASCII(name), 1,
|
| - install_source);
|
| - ASSERT_TRUE(extension);
|
| - extension_name_to_ids_[name] = extension->id();
|
| - }
|
| +namespace extensions {
|
|
|
| - std::map<std::string, std::string> extension_name_to_ids_;
|
| -};
|
| +using DeveloperPrivateApiTest = ExtensionApiTest;
|
|
|
| IN_PROC_BROWSER_TEST_F(DeveloperPrivateApiTest, Basics) {
|
| - LoadExtensions();
|
| -
|
| - base::FilePath basedir = test_data_dir_.AppendASCII("developer");
|
| - InstallNamedExtension(basedir, "packaged_app", Manifest::INTERNAL);
|
| -
|
| - InstallNamedExtension(basedir, "simple_extension", Manifest::INTERNAL);
|
| + // Load up some extensions so that we can query their info and adjust their
|
| + // setings in the API test.
|
| + base::FilePath base_dir = test_data_dir_.AppendASCII("developer");
|
| + EXPECT_TRUE(LoadExtension(base_dir.AppendASCII("hosted_app")));
|
| + EXPECT_TRUE(InstallExtension(
|
| + base_dir.AppendASCII("packaged_app"), 1, Manifest::INTERNAL));
|
| + LoadExtension(base_dir.AppendASCII("simple_extension"));
|
|
|
| ASSERT_TRUE(RunPlatformAppTestWithFlags(
|
| "developer/test", kFlagLoadAsComponent));
|
| }
|
| +
|
| +} // namespace extensions
|
|
|