| Index: chrome/common/extensions/manifest_handlers/automation_unittest.cc
|
| diff --git a/chrome/common/extensions/manifest_handlers/automation_unittest.cc b/chrome/common/extensions/manifest_handlers/automation_unittest.cc
|
| index 91487826cc1e6f2081777a390a2efd542c9d830f..96c13e43aacc083f1d33da8d68088549b79cb4f3 100644
|
| --- a/chrome/common/extensions/manifest_handlers/automation_unittest.cc
|
| +++ b/chrome/common/extensions/manifest_handlers/automation_unittest.cc
|
| @@ -3,8 +3,9 @@
|
| // found in the LICENSE file.
|
|
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "chrome/common/extensions/features/feature_channel.h"
|
| #include "chrome/common/extensions/manifest_handlers/automation.h"
|
| -#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
|
| +#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "extensions/common/error_utils.h"
|
| #include "extensions/common/manifest_constants.h"
|
| @@ -14,7 +15,7 @@
|
|
|
| namespace extensions {
|
|
|
| -class AutomationManifestTest : public ExtensionManifestTest {
|
| +class AutomationManifestTest : public ChromeManifestTest {
|
| public:
|
| AutomationManifestTest() : channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}
|
|
|
| @@ -156,7 +157,7 @@ TEST_F(AutomationManifestTest, EmptyMatches) {
|
| TEST_F(AutomationManifestTest, NoValidMatches) {
|
| std::string error;
|
| scoped_refptr<Extension> extension =
|
| - LoadExtension(Manifest("automation_no_valid_matches.json"), &error);
|
| + LoadExtension(ManifestData("automation_no_valid_matches.json"), &error);
|
| ASSERT_TRUE(extension.get());
|
| EXPECT_EQ("", error);
|
| EXPECT_EQ(2u, extension->install_warnings().size());
|
|
|