| Index: extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
|
| diff --git a/chrome/common/extensions/api/file_handlers/file_handlers_manifest_unittest.cc b/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
|
| similarity index 83%
|
| rename from chrome/common/extensions/api/file_handlers/file_handlers_manifest_unittest.cc
|
| rename to extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
|
| index 5e0cd3daef1ed9d614ef6033c23e4a6cf4b4ecce..0f45ad45059e8ce1d283a3824f530dff1c0b6f51 100644
|
| --- a/chrome/common/extensions/api/file_handlers/file_handlers_manifest_unittest.cc
|
| +++ b/extensions/common/manifest_handlers/file_handler_manifest_unittest.cc
|
| @@ -2,18 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/common/extensions/api/file_handlers/file_handlers_parser.h"
|
| -#include "chrome/common/extensions/extension_constants.h"
|
| #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
|
| -//#include "extensions/common/error_utils.h"
|
| #include "extensions/common/manifest_constants.h"
|
| +#include "extensions/common/manifest_handlers/file_handler_info.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -namespace errors = extensions::manifest_errors;
|
| +namespace extensions {
|
|
|
| -using extensions::Extension;
|
| -using extensions::FileHandlers;
|
| -using extensions::FileHandlerInfo;
|
| +namespace errors = manifest_errors;
|
|
|
| class FileHandlersManifestTest : public ExtensionManifestTest {
|
| };
|
| @@ -45,8 +41,7 @@ TEST_F(FileHandlersManifestTest, ValidFileHandlers) {
|
| LoadAndExpectSuccess("file_handlers_valid.json");
|
|
|
| ASSERT_TRUE(extension.get());
|
| - const std::vector<FileHandlerInfo>* handlers =
|
| - FileHandlers::GetFileHandlers(extension.get());
|
| + const FileHandlersInfo* handlers = FileHandlers::GetFileHandlers(extension);
|
| ASSERT_TRUE(handlers != NULL);
|
| ASSERT_EQ(2U, handlers->size());
|
|
|
| @@ -73,7 +68,8 @@ TEST_F(FileHandlersManifestTest, NotPlatformApp) {
|
| LoadAndExpectSuccess("file_handlers_invalid_not_app.json");
|
|
|
| ASSERT_TRUE(extension.get());
|
| - const std::vector<FileHandlerInfo>* handlers =
|
| - FileHandlers::GetFileHandlers(extension.get());
|
| + const FileHandlersInfo* handlers = FileHandlers::GetFileHandlers(extension);
|
| ASSERT_TRUE(handlers == NULL);
|
| }
|
| +
|
| +} // namespace extensions
|
|
|