Browser changes for wiring up RequestContentScript API to shared memory

chrome/browser/extensions/api/declarative_content/content_action_unittest.cc

Index: chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
index bf29bb5dfcd4372223ab480dd77bd1724fa67c5f..0a41005f43963714a1d781316a43d16f3f8251c0 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action_unittest.cc
@@ -4,13 +4,19 @@
 
 #include "chrome/browser/extensions/api/declarative_content/content_action.h"
 
+#include "base/run_loop.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
+#include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
+#include "chrome/browser/extensions/test_extension_system.h"
+#include "chrome/test/base/testing_profile.h"

[Devlin, 2014/08/28 21:47:09]

don't need

 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_system.h"
+#include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -21,6 +27,42 @@ namespace {
 using base::test::ParseJson;
 using testing::HasSubstr;
 
+
+scoped_ptr<base::DictionaryValue> SimpleManifest() {
+  return DictionaryBuilder()
+      .Set("name", "extension")
+      .Set("manifest_version", 2)
+      .Set("version", "1.0")
+      .Build();
+}
+
+class RequestContentScriptTest : public ExtensionServiceTestBase {
+ public:
+  RequestContentScriptTest();
+
+  // TODO(rdevlin.cronin): This should be SetUp(), but an issues with invoking

[Devlin, 2014/08/28 21:47:10]

nit: not "an issues"

+  // InitializeEmptyExtensionService() within SetUp() means that we have to
+  // call this manually within every test. This can be cleaned up once said
+  // issue is fixed.
+  virtual void Init();
+
+  Profile* profile() { return profile_.get(); }
+  Extension* extension() { return extension_.get(); }
+
+ private:
+  scoped_refptr<Extension> extension_;
+};
+
+RequestContentScriptTest::RequestContentScriptTest()

[Jeffrey Yasskin, 2014/08/28 21:38:47]

Inside a test, it's generally good to define methods inline.

[Devlin, 2014/08/28 21:47:10]

He probably got this from me.  I've heard it a bit both ways, and there was a
very passionate discussion here:
https://groups.google.com/a/chromium.org/forum/#!searchin/chromium-dev/inline...

which (from a brief skim) didn't really seem to come to a decided conclusion.

I generally like to define longer methods out-of-line in tests, but for
constructors and the simple init, it does seem superfluous.  And, in any event,
OWNERS rules. :)

[Mark Dittmer, 2014/08/28 21:59:47]

Done.

+    : extension_(ExtensionBuilder().SetManifest(SimpleManifest()).Build()) {}
+
+void RequestContentScriptTest::Init() {
+  InitializeEmptyExtensionService();
+  static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile()))->
+      SetReady();
+  base::RunLoop().RunUntilIdle();
+}
+
 TEST(DeclarativeContentActionTest, InvalidCreation) {
   TestExtensionEnvironment env;
   std::string error;
@@ -29,21 +71,23 @@ TEST(DeclarativeContentActionTest, InvalidCreation) {
 
   // Test wrong data type passed.
   error.clear();
-  result = ContentAction::Create(NULL, *ParseJson("[]"), &error, &bad_message);
+  result = ContentAction::Create(
+      NULL, NULL, *ParseJson("[]"), &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_EQ("", error);
   EXPECT_FALSE(result.get());
 
   // Test missing instanceType element.
   error.clear();
-  result = ContentAction::Create(NULL, *ParseJson("{}"), &error, &bad_message);
+  result = ContentAction::Create(
+      NULL, NULL, *ParseJson("{}"), &error, &bad_message);
   EXPECT_TRUE(bad_message);
   EXPECT_EQ("", error);
   EXPECT_FALSE(result.get());
 
   // Test wrong instanceType element.
   error.clear();
-  result = ContentAction::Create(NULL, *ParseJson(
+  result = ContentAction::Create(NULL, NULL, *ParseJson(
       "{\n"
       "  \"instanceType\": \"declarativeContent.UnknownType\",\n"
       "}"),
@@ -59,6 +103,7 @@ TEST(DeclarativeContentActionTest, ShowPageActionWithoutPageAction) {
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
+      NULL,
       extension,
       *ParseJson(
            "{\n"
@@ -79,6 +124,7 @@ TEST(DeclarativeContentActionTest, ShowPageAction) {
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
+      NULL,
       extension,
       *ParseJson(
            "{\n"
@@ -109,13 +155,13 @@ TEST(DeclarativeContentActionTest, ShowPageAction) {
   EXPECT_FALSE(page_action->GetIsVisible(tab_id));
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptMissingScripts) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, MissingScripts) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -129,13 +175,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptMissingScripts) {
   ASSERT_FALSE(result.get());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptCSS) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, CSS) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -149,13 +195,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptCSS) {
   EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptJS) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, JS) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -169,13 +215,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptJS) {
   EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptCSSBadType) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, CSSBadType) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -187,13 +233,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptCSSBadType) {
   ASSERT_FALSE(result.get());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptJSBadType) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, JSBadType) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -205,13 +251,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptJSBadType) {
   ASSERT_FALSE(result.get());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptAllFrames) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, AllFrames) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -226,13 +272,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptAllFrames) {
   EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptMatchAboutBlank) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, MatchAboutBlank) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -247,13 +293,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptMatchAboutBlank) {
   EXPECT_EQ(ContentAction::ACTION_REQUEST_CONTENT_SCRIPT, result->GetType());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptAllFramesBadType) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, AllFramesBadType) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"
@@ -266,13 +312,13 @@ TEST(DeclarativeContentActionTest, RequestContentScriptAllFramesBadType) {
   ASSERT_FALSE(result.get());
 }
 
-TEST(DeclarativeContentActionTest, RequestContentScriptMatchAboutBlankBadType) {
-  TestExtensionEnvironment env;
-
+TEST_F(RequestContentScriptTest, MatchAboutBlankBadType) {
+  Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
-      NULL,
+      profile(),
+      extension(),
       *ParseJson(
           "{\n"
           "  \"instanceType\": \"declarativeContent.RequestContentScript\",\n"