Index: chrome/common/extensions/extension_unittest.cc |
diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc |
index 72d04c3fb562d16d2373ad3f1fbdb950e89933bd..10de3467b8d5f9f6b2c28e158fdb13af0bba9620 100644 |
--- a/chrome/common/extensions/extension_unittest.cc |
+++ b/chrome/common/extensions/extension_unittest.cc |
@@ -14,7 +14,6 @@ |
#include "base/utf_string_conversions.h" |
#include "chrome/common/chrome_paths.h" |
#include "chrome/common/extensions/command.h" |
-#include "chrome/common/extensions/extension_action.h" |
#include "chrome/common/extensions/extension_error_utils.h" |
#include "chrome/common/extensions/extension_file_util.h" |
#include "chrome/common/extensions/extension_manifest_constants.h" |
@@ -107,10 +106,10 @@ static scoped_refptr<Extension> LoadManifestStrict( |
return LoadManifest(dir, test_file, Extension::NO_FLAGS); |
} |
-static scoped_ptr<ExtensionAction> LoadAction(const std::string& manifest) { |
+static Extension::ActionInfo LoadAction(const std::string& manifest) { |
scoped_refptr<Extension> extension = LoadManifest("page_action", |
manifest); |
- return extension->page_action()->CopyForTest(); |
+ return *extension->page_action(); |
} |
static void LoadActionAndExpectError(const std::string& manifest, |