Rework ExtensionApiUnittest to run in extensions_unittests, removing its Chrome dependencies.

extensions/browser/extension_api_unittest.h

Index: extensions/browser/extension_api_unittest.h
diff --git a/chrome/browser/extensions/extension_api_unittest.h b/extensions/browser/extension_api_unittest.h
similarity index 59%
copy from chrome/browser/extensions/extension_api_unittest.h
copy to extensions/browser/extension_api_unittest.h
index 71bb591a29f0334fd040543ce0b2b32bbe707bd2..622fdcdcb2de7e31580df0b6470132ef2f5c156d 100644
--- a/chrome/browser/extensions/extension_api_unittest.h
+++ b/extensions/browser/extension_api_unittest.h
@@ -2,14 +2,18 @@
 // 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_EXTENSION_API_UNITTEST_H_
+#define EXTENSIONS_BROWSER_EXTENSION_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"
+#include "extensions/common/extension.h"

[James Cook, 2014/08/13 16:11:36]

Do you need this include?  (Maybe, for set_extension?)

[Yoyo Zhou, 2014/08/13 22:53:43]

No.

+#include "testing/gtest/include/gtest/gtest.h"

[James Cook, 2014/08/13 16:11:36]

Do you need this include?

[Yoyo Zhou, 2014/08/13 22:53:43]

No.

 
 namespace base {
 class Value;
@@ -18,7 +22,8 @@ class ListValue;
 }
 
 namespace content {
-class WebContents;
+class NotificationService;
+class TestBrowserThreadBundle;
 }
 
 class UIThreadExtensionFunction;
@@ -29,19 +34,13 @@ 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 ExtensionApiUnittest : public ExtensionsTest {

[James Cook, 2014/08/13 16:11:36]

Thoughts on naming:

This one could be named extensions::ApiUnitTest or extensions::ApiUnitTestBase.
This one could become extensions::Extension*s*ApiUnittest. (yuck)
The Chrome one could come out of the extensions:: namespace (yuck yuck).

Or we could go with extensions::ExtensionApiUnitTestBase, which is long but OK.

(Unit*T*estBase is more common than Unit*t*estBase in chrome code, and I think I
prefer the former despite the _unittest_base.cc filename.  I don't feel
strongly, if you have a preference.)

[Yoyo Zhou, 2014/08/13 22:53:43]

I like the idea of extensions::ApiUnitTest, in keeping with api_test_utils and
such.

  public:
   ExtensionApiUnittest();
   virtual ~ExtensionApiUnittest();
 
-  content::WebContents* contents() { return contents_; }
-
   const Extension* extension() const { return extension_.get(); }
   scoped_refptr<Extension> extension_ref() { return extension_; }
   void set_extension(scoped_refptr<Extension> extension) {
@@ -52,42 +51,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 +95,4 @@ class ExtensionApiUnittest : public BrowserWithTestWindowTest {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_API_UNITTEST_H_
+#endif  // EXTENSIONS_BROWSER_EXTENSION_API_UNITTEST_H_