summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_function_test_utils.h
diff options
context:
space:
mode:
authormtytel@chromium.org <mtytel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 21:33:43 +0000
committermtytel@chromium.org <mtytel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 21:33:43 +0000
commit6d2d55b661b11e038d53c4b9271b67e719a72cc6 (patch)
tree84093d5da6810192f37b24e8174ce617a7ce6340 /chrome/browser/extensions/extension_function_test_utils.h
parent737838897fe41e031771979e75c4dfb6dad924cb (diff)
downloadchromium_src-6d2d55b661b11e038d53c4b9271b67e719a72cc6.zip
chromium_src-6d2d55b661b11e038d53c4b9271b67e719a72cc6.tar.gz
chromium_src-6d2d55b661b11e038d53c4b9271b67e719a72cc6.tar.bz2
Alarm resolution changed to minutes and minimum delay added.
There is a 5 minute minimum delay enforced for released extensions and a 0 minute delay enforced for extensions in development. BUG=122821 TEST=Call chrome.experimental.alarms.create and verify that the alarm is delayed in the number of minutes passed in. Review URL: http://codereview.chromium.org/10217018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_function_test_utils.h')
-rw-r--r--chrome/browser/extensions/extension_function_test_utils.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_function_test_utils.h b/chrome/browser/extensions/extension_function_test_utils.h
index 225974d..27336a5 100644
--- a/chrome/browser/extensions/extension_function_test_utils.h
+++ b/chrome/browser/extensions/extension_function_test_utils.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,6 +9,7 @@
#include <string>
#include "base/memory/ref_counted.h"
+#include "chrome/common/extensions/extension.h"
class AsyncExtensionFunction;
class Browser;
@@ -46,6 +47,11 @@ base::ListValue* ToList(base::Value* val);
// before running it.
scoped_refptr<Extension> CreateEmptyExtension();
+// Creates an extension instance with a specified location that can be attached
+// to an ExtensionFunction before running.
+scoped_refptr<Extension> CreateEmptyExtensionWithLocation(
+ Extension::Location location);
+
enum RunFunctionFlags {
NONE = 0,
INCLUDE_INCOGNITO = 1 << 0