| Index: extensions/browser/api_unittest.h
|
| diff --git a/chrome/browser/extensions/extension_api_unittest.h b/extensions/browser/api_unittest.h
|
| similarity index 57%
|
| copy from chrome/browser/extensions/extension_api_unittest.h
|
| copy to extensions/browser/api_unittest.h
|
| index 71bb591a29f0334fd040543ce0b2b32bbe707bd2..328ef9f99634f9a3497762343292c6d8d8ed78fa 100644
|
| --- a/chrome/browser/extensions/extension_api_unittest.h
|
| +++ b/extensions/browser/api_unittest.h
|
| @@ -2,14 +2,16 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_API_UNITTEST_H_
|
| -#define CHROME_BROWSER_EXTENSIONS_EXTENSION_API_UNITTEST_H_
|
| +#ifndef EXTENSIONS_BROWSER_API_UNITTEST_H_
|
| +#define EXTENSIONS_BROWSER_API_UNITTEST_H_
|
|
|
| #include <string>
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "chrome/test/base/browser_with_test_window_test.h"
|
| +#include "base/prefs/testing_pref_service.h"
|
| +#include "extensions/browser/extensions_test.h"
|
| +#include "extensions/browser/mock_extension_system.h"
|
|
|
| namespace base {
|
| class Value;
|
| @@ -18,7 +20,8 @@ class ListValue;
|
| }
|
|
|
| namespace content {
|
| -class WebContents;
|
| +class NotificationService;
|
| +class TestBrowserThreadBundle;
|
| }
|
|
|
| class UIThreadExtensionFunction;
|
| @@ -29,18 +32,12 @@ namespace extensions {
|
| // By default, this class will create and load an empty unpacked |extension_|,
|
| // which will be used in all API function calls. This extension can be
|
| // overridden using set_extension().
|
| -// By default, this class does not create a WebContents for the API functions.
|
| -// If a WebContents is needed, calling CreateBackgroundPage() will create a
|
| -// background page for the extension and use it in API function calls. (If
|
| -// needed, this could be expanded to allow for alternate WebContents).
|
| // When calling RunFunction[AndReturn*], |args| should be in JSON format,
|
| -// wrapped in a list. See also RunFunction* in extension_function_test_utils.h.
|
| -class ExtensionApiUnittest : public BrowserWithTestWindowTest {
|
| +// wrapped in a list. See also RunFunction* in api_test_utils.h.
|
| +class ApiUnitTest : public ExtensionsTest {
|
| public:
|
| - ExtensionApiUnittest();
|
| - virtual ~ExtensionApiUnittest();
|
| -
|
| - content::WebContents* contents() { return contents_; }
|
| + ApiUnitTest();
|
| + virtual ~ApiUnitTest();
|
|
|
| const Extension* extension() const { return extension_.get(); }
|
| scoped_refptr<Extension> extension_ref() { return extension_; }
|
| @@ -52,42 +49,43 @@ class ExtensionApiUnittest : public BrowserWithTestWindowTest {
|
| // SetUp creates and loads an empty, unpacked Extension.
|
| virtual void SetUp() OVERRIDE;
|
|
|
| - // Creates a background page for |extension_|, and sets it for the WebContents
|
| - // to be used in API calls.
|
| - // If |contents_| is already set, this does nothing.
|
| - void CreateBackgroundPage();
|
| -
|
| // Various ways of running an API function. These methods take ownership of
|
| // |function|. |args| should be in JSON format, wrapped in a list.
|
| // See also the RunFunction* methods in extension_function_test_utils.h.
|
|
|
| // Return the function result as a base::Value.
|
| scoped_ptr<base::Value> RunFunctionAndReturnValue(
|
| - UIThreadExtensionFunction* function, const std::string& args);
|
| + UIThreadExtensionFunction* function,
|
| + const std::string& args);
|
|
|
| // Return the function result as a base::DictionaryValue, or NULL.
|
| // This will EXPECT-fail if the result is not a DictionaryValue.
|
| scoped_ptr<base::DictionaryValue> RunFunctionAndReturnDictionary(
|
| - UIThreadExtensionFunction* function, const std::string& args);
|
| + UIThreadExtensionFunction* function,
|
| + const std::string& args);
|
|
|
| // Return the function result as a base::ListValue, or NULL.
|
| // This will EXPECT-fail if the result is not a ListValue.
|
| scoped_ptr<base::ListValue> RunFunctionAndReturnList(
|
| - UIThreadExtensionFunction* function, const std::string& args);
|
| + UIThreadExtensionFunction* function,
|
| + const std::string& args);
|
|
|
| // Return an error thrown from the function, if one exists.
|
| // This will EXPECT-fail if any result is returned from the function.
|
| - std::string RunFunctionAndReturnError(
|
| - UIThreadExtensionFunction* function, const std::string& args);
|
| + std::string RunFunctionAndReturnError(UIThreadExtensionFunction* function,
|
| + const std::string& args);
|
|
|
| // Run the function and ignore any result.
|
| - void RunFunction(
|
| - UIThreadExtensionFunction* function, const std::string& args);
|
| + void RunFunction(UIThreadExtensionFunction* function,
|
| + const std::string& args);
|
|
|
| private:
|
| - // The WebContents used to associate a RenderViewHost with API function calls,
|
| - // or NULL.
|
| - content::WebContents* contents_;
|
| + scoped_ptr<content::NotificationService> notification_service_;
|
| +
|
| + scoped_ptr<content::TestBrowserThreadBundle> thread_bundle_;
|
| + TestingPrefServiceSimple testing_pref_service_;
|
| +
|
| + MockExtensionSystemFactory<MockExtensionSystem> extension_system_factory_;
|
|
|
| // The Extension used when running API function calls.
|
| scoped_refptr<Extension> extension_;
|
| @@ -95,4 +93,4 @@ class ExtensionApiUnittest : public BrowserWithTestWindowTest {
|
|
|
| } // namespace extensions
|
|
|
| -#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_API_UNITTEST_H_
|
| +#endif // EXTENSIONS_BROWSER_API_UNITTEST_H_
|
|
|