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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10696208: Move ExtensionEventRouter and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed bug + latest master 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
« no previous file with comments | « chrome/browser/extensions/event_router_forwarder.cc ('k') | chrome/browser/extensions/extension_browser_event_router.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/event_router_forwarder_unittest.cc
diff --git a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc
similarity index 62%
rename from chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
rename to chrome/browser/extensions/event_router_forwarder_unittest.cc
index 110249a041ac38195f4661d0f63b904ce844596a..ab68262f5e16b89ee010084519ac2fda27ba7458 100644
--- a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/extension_event_router_forwarder.h"
+#include "chrome/browser/extensions/event_router_forwarder.h"
#include "base/bind.h"
#include "base/message_loop.h"
@@ -19,27 +19,29 @@
using content::BrowserThread;
+namespace extensions {
+
namespace {
const char kEventName[] = "event_name";
const char kEventArgs[] = "event_args";
const char kExt[] = "extension";
-class MockExtensionEventRouterForwarder : public ExtensionEventRouterForwarder {
+class MockEventRouterForwarder : public EventRouterForwarder {
public:
- MOCK_METHOD6(CallExtensionEventRouter,
+ MOCK_METHOD6(CallEventRouter,
void(Profile*, const std::string&, const std::string&, const std::string&,
Profile*, const GURL&));
protected:
- virtual ~MockExtensionEventRouterForwarder() {}
+ virtual ~MockEventRouterForwarder() {}
};
} // namespace
-class ExtensionEventRouterForwarderTest : public testing::Test {
+class EventRouterForwarderTest : public testing::Test {
protected:
- ExtensionEventRouterForwarderTest()
+ EventRouterForwarderTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
io_thread_(BrowserThread::IO),
profile_manager_(
@@ -77,52 +79,52 @@ class ExtensionEventRouterForwarderTest : public testing::Test {
TestingProfile* profile2_;
};
-TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererUI) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, BroadcastRendererUI) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, "", kEventName, kEventArgs, profile1_, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile2_, "", kEventName, kEventArgs, profile2_, url));
event_router->BroadcastEventToRenderers(kEventName, kEventArgs, url);
}
-TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererUIIncognito) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, BroadcastRendererUIIncognito) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
using ::testing::_;
GURL url;
Profile* incognito = CreateIncognitoProfile(profile1_);
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, "", kEventName, kEventArgs, profile1_, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
+ CallEventRouter(incognito, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile2_, "", kEventName, kEventArgs, profile2_, url));
event_router->BroadcastEventToRenderers(kEventName, kEventArgs, url);
}
// This is the canonical test for passing control flow from the IO thread
// to the UI thread. Repeating this for all public functions of
-// ExtensionEventRouterForwarder would not increase coverage.
-TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererIO) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+// EventRouterForwarder would not increase coverage.
+TEST_F(EventRouterForwarderTest, BroadcastRendererIO) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, "", kEventName, kEventArgs, profile1_, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile2_, "", kEventName, kEventArgs, profile2_, url));
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(
- &MockExtensionEventRouterForwarder::BroadcastEventToRenderers,
+ &MockEventRouterForwarder::BroadcastEventToRenderers,
event_router.get(),
std::string(kEventName), std::string(kEventArgs), url));
@@ -135,125 +137,124 @@ TEST_F(ExtensionEventRouterForwarderTest, BroadcastRendererIO) {
MessageLoop::current()->RunAllPending();
}
-TEST_F(ExtensionEventRouterForwarderTest, UnicastRendererUIRestricted) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, UnicastRendererUIRestricted) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, "", kEventName, kEventArgs, profile1_, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile2_, _, _, _, _, _)).Times(0);
event_router->DispatchEventToRenderers(kEventName, kEventArgs,
profile1_, true, url);
}
-TEST_F(ExtensionEventRouterForwarderTest,
- UnicastRendererUIRestrictedIncognito1) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, UnicastRendererUIRestrictedIncognito1) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
Profile* incognito = CreateIncognitoProfile(profile1_);
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, "", kEventName, kEventArgs, profile1_, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
+ CallEventRouter(incognito, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile2_, _, _, _, _, _)).Times(0);
event_router->DispatchEventToRenderers(kEventName, kEventArgs,
profile1_, true, url);
}
-TEST_F(ExtensionEventRouterForwarderTest,
- UnicastRendererUIRestrictedIncognito2) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, UnicastRendererUIRestrictedIncognito2) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
Profile* incognito = CreateIncognitoProfile(profile1_);
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile1_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile1_, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
incognito, "", kEventName, kEventArgs, incognito, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile2_, _, _, _, _, _)).Times(0);
event_router->DispatchEventToRenderers(kEventName, kEventArgs,
incognito, true, url);
}
-TEST_F(ExtensionEventRouterForwarderTest, UnicastRendererUIUnrestricted) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, UnicastRendererUIUnrestricted) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, "", kEventName, kEventArgs, NULL, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile2_, _, _, _, _, _)).Times(0);
event_router->DispatchEventToRenderers(kEventName, kEventArgs,
profile1_, false, url);
}
-TEST_F(ExtensionEventRouterForwarderTest,
- UnicastRendererUIUnrestrictedIncognito) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, UnicastRendererUIUnrestrictedIncognito) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
Profile* incognito = CreateIncognitoProfile(profile1_);
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, "", kEventName, kEventArgs, NULL, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(incognito, _, _, _, _, _)).Times(0);
+ CallEventRouter(incognito, _, _, _, _, _)).Times(0);
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile2_, _, _, _, _, _)).Times(0);
event_router->DispatchEventToRenderers(kEventName, kEventArgs,
profile1_, false, url);
}
-TEST_F(ExtensionEventRouterForwarderTest, BroadcastExtensionUI) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, BroadcastExtensionUI) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, kExt, kEventName, kEventArgs, profile1_, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile2_, kExt, kEventName, kEventArgs, profile2_, url));
event_router->BroadcastEventToExtension(kExt, kEventName, kEventArgs, url);
}
-TEST_F(ExtensionEventRouterForwarderTest, UnicastExtensionUIRestricted) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, UnicastExtensionUIRestricted) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, kExt, kEventName, kEventArgs, profile1_, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile2_, _, _, _, _, _)).Times(0);
event_router->DispatchEventToExtension(kExt, kEventName, kEventArgs,
profile1_, true, url);
}
-TEST_F(ExtensionEventRouterForwarderTest, UnicastExtensionUIUnrestricted) {
- scoped_refptr<MockExtensionEventRouterForwarder> event_router(
- new MockExtensionEventRouterForwarder);
+TEST_F(EventRouterForwarderTest, UnicastExtensionUIUnrestricted) {
+ scoped_refptr<MockEventRouterForwarder> event_router(
+ new MockEventRouterForwarder);
using ::testing::_;
GURL url;
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(
+ CallEventRouter(
profile1_, kExt, kEventName, kEventArgs, NULL, url));
EXPECT_CALL(*event_router,
- CallExtensionEventRouter(profile2_, _, _, _, _, _)).Times(0);
+ CallEventRouter(profile2_, _, _, _, _, _)).Times(0);
event_router->DispatchEventToExtension(kExt, kEventName, kEventArgs,
profile1_, false, url);
}
+
+} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/event_router_forwarder.cc ('k') | chrome/browser/extensions/extension_browser_event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698