| Index: chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| diff --git a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| index 7cbf241227981e65f83bd7aba1727cec396adcd8..51a5b4f776668a8806c0849d0a602869c7876789 100644
|
| --- a/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| +++ b/chrome/common/extensions/api/extension_action/page_action_manifest_unittest.cc
|
| @@ -2,8 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "base/path_service.h"
|
| +#include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/extensions/api/extension_action/action_info.h"
|
| -#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
|
| +#include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
|
| #include "extensions/common/constants.h"
|
| #include "extensions/common/error_utils.h"
|
| #include "extensions/common/extension.h"
|
| @@ -15,10 +17,12 @@ namespace extensions {
|
| namespace errors = manifest_errors;
|
| namespace keys = manifest_keys;
|
|
|
| -class PageActionManifestTest : public ExtensionManifestTest {
|
| +class PageActionManifestTest : public ChromeManifestTest {
|
| protected:
|
| - virtual const char* test_data_dir() OVERRIDE {
|
| - return "page_action";
|
| + virtual base::FilePath GetTestDataDir() OVERRIDE {
|
| + base::FilePath path;
|
| + PathService::Get(chrome::DIR_TEST_DATA, &path);
|
| + return path.AppendASCII("extensions").AppendASCII("page_action");
|
| }
|
|
|
| scoped_ptr<ActionInfo> LoadAction(const std::string& manifest_filename);
|
|
|