Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4682)

Unified Diff: chrome/common/extensions/extension_unittest.cc

Issue 10911300: Move ExtensionAction from common/ to browser/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: proof of concept Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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,

Powered by Google App Engine
This is Rietveld 408576698