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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_event_router_forwarder_unittest.cc

Issue 10694085: Refactor extension event distribution to use Values instead of JSON strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and review changes. Created 8 years, 5 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
« chrome/browser/extensions/extension_event_router.cc ('K') | « chrome/browser/extensions/extension_event_router_forwarder.cc ('k') | chrome/browser/extensions/extension_idle_api.cc » ('j') | chrome/browser/extensions/extension_processes_api.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
diff --git a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
index 110249a041ac38195f4661d0f63b904ce844596a..cca380f2dfa2b1b2385c2e1a07dcab7b2cf3bae9 100644
--- a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
@@ -22,13 +22,12 @@ using content::BrowserThread;
namespace {
const char kEventName[] = "event_name";
-const char kEventArgs[] = "event_args";
const char kExt[] = "extension";
class MockExtensionEventRouterForwarder : public ExtensionEventRouterForwarder {
public:
MOCK_METHOD6(CallExtensionEventRouter,
- void(Profile*, const std::string&, const std::string&, const std::string&,
+ void(Profile*, const std::string&, const std::string&, base::ListValue*,
Profile*, const GURL&));
protected:
@@ -83,11 +82,11 @@ TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererUI) {
GURL url;
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, "", kEventName, kEventArgs, profile1_, url));
+ profile1_, "", kEventName, NULL, profile1_, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile2_, "", kEventName, kEventArgs, profile2_, url));
- event_router->BroadcastEventToRenderers(kEventName, kEventArgs, url);
+ profile2_, "", kEventName, NULL, profile2_, url));
+ event_router->BroadcastEventToRenderers(kEventName, NULL, url);
}
TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererUIIncognito) {
@@ -98,13 +97,13 @@ TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererUIIncognito) {
Profile* incognito = CreateIncognitoProfile(profile1_);
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, "", kEventName, kEventArgs, profile1_, url));
+ profile1_, "", kEventName, NULL, profile1_, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile2_, "", kEventName, kEventArgs, profile2_, url));
- event_router->BroadcastEventToRenderers(kEventName, kEventArgs, url);
+ profile2_, "", kEventName, NULL, profile2_, url));
+ event_router->BroadcastEventToRenderers(kEventName, NULL, url);
}
// This is the canonical test for passing control flow from the IO thread
@@ -116,15 +115,15 @@ TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererIO) {
GURL url;
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, "", kEventName, kEventArgs, profile1_, url));
+ profile1_, "", kEventName, NULL, profile1_, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile2_, "", kEventName, kEventArgs, profile2_, url));
+ profile2_, "", kEventName, NULL, profile2_, url));
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(
&MockExtensionEventRouterForwarder::BroadcastEventToRenderers,
- event_router.get(),
- std::string(kEventName), std::string(kEventArgs), url));
+ event_router.get(), std::string(kEventName),
+ static_cast<base::ListValue*>(NULL), url));
// Wait for IO thread's message loop to be processed
scoped_refptr<base::ThreadTestHelper> helper(
@@ -142,11 +141,11 @@ TEST_F(ExtensionEventRouterForwarderTest, UnicastRendererUIRestricted) {
GURL url;
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, "", kEventName, kEventArgs, profile1_, url));
+ profile1_, "", kEventName, NULL, profile1_, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
- event_router->DispatchEventToRenderers(kEventName, kEventArgs,
- profile1_, true, url);
+ event_router->DispatchEventToRenderers(kEventName, NULL, profile1_, true,
+ url);
}
TEST_F(ExtensionEventRouterForwarderTest,
@@ -158,12 +157,12 @@ TEST_F(ExtensionEventRouterForwarderTest,
GURL url;
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, "", kEventName, kEventArgs, profile1_, url));
+ profile1_, "", kEventName, NULL, profile1_, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
- event_router->DispatchEventToRenderers(kEventName, kEventArgs,
+ event_router->DispatchEventToRenderers(kEventName, NULL,
profile1_, true, url);
}
@@ -178,10 +177,10 @@ TEST_F(ExtensionEventRouterForwarderTest,
CallExtensionEventRouter(profile1_, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- incognito, "", kEventName, kEventArgs, incognito, url));
+ incognito, "", kEventName, NULL, incognito, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
- event_router->DispatchEventToRenderers(kEventName, kEventArgs,
+ event_router->DispatchEventToRenderers(kEventName, NULL,
incognito, true, url);
}
@@ -191,11 +190,10 @@ TEST_F(ExtensionEventRouterForwarderTest, UnicastRendererUIUnrestricted) {
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
- profile1_, "", kEventName, kEventArgs, NULL, url));
+ CallExtensionEventRouter(profile1_, "", kEventName, NULL, NULL, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
- event_router->DispatchEventToRenderers(kEventName, kEventArgs,
+ event_router->DispatchEventToRenderers(kEventName, NULL,
profile1_, false, url);
}
@@ -207,14 +205,13 @@ TEST_F(ExtensionEventRouterForwarderTest,
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
- profile1_, "", kEventName, kEventArgs, NULL, url));
+ CallExtensionEventRouter(profile1_, "", kEventName, NULL, NULL, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
- event_router->DispatchEventToRenderers(kEventName, kEventArgs,
- profile1_, false, url);
+ event_router->DispatchEventToRenderers(kEventName, NULL, profile1_, false,
+ url);
}
TEST_F(ExtensionEventRouterForwarderTest, BroadcastExtensionUI) {
@@ -223,11 +220,11 @@ TEST_F(ExtensionEventRouterForwarderTest, BroadcastExtensionUI) {
GURL url;
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, kExt, kEventName, kEventArgs, profile1_, url));
+ profile1_, kExt, kEventName, NULL, profile1_, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile2_, kExt, kEventName, kEventArgs, profile2_, url));
- event_router->BroadcastEventToExtension(kExt, kEventName, kEventArgs, url);
+ profile2_, kExt, kEventName, NULL, profile2_, url));
+ event_router->BroadcastEventToExtension(kExt, kEventName, NULL, url);
}
TEST_F(ExtensionEventRouterForwarderTest, UnicastExtensionUIRestricted) {
@@ -237,10 +234,10 @@ TEST_F(ExtensionEventRouterForwarderTest, UnicastExtensionUIRestricted) {
GURL url;
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, kExt, kEventName, kEventArgs, profile1_, url));
+ profile1_, kExt, kEventName, NULL, profile1_, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
- event_router->DispatchEventToExtension(kExt, kEventName, kEventArgs,
+ event_router->DispatchEventToExtension(kExt, kEventName, NULL,
profile1_, true, url);
}
@@ -251,9 +248,9 @@ TEST_F(ExtensionEventRouterForwarderTest, UnicastExtensionUIUnrestricted) {
GURL url;
EXPECT_CALL(*event_router,
CallExtensionEventRouter(
- profile1_, kExt, kEventName, kEventArgs, NULL, url));
+ profile1_, kExt, kEventName, NULL, NULL, url));
EXPECT_CALL(*event_router,
CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
- event_router->DispatchEventToExtension(kExt, kEventName, kEventArgs,
+ event_router->DispatchEventToExtension(kExt, kEventName, NULL,
profile1_, false, url);
}
« chrome/browser/extensions/extension_event_router.cc ('K') | « chrome/browser/extensions/extension_event_router_forwarder.cc ('k') | chrome/browser/extensions/extension_idle_api.cc » ('j') | chrome/browser/extensions/extension_processes_api.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698