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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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/crx_installer.cc ('k') | chrome/browser/extensions/extension_action_icon_factory_unittest.cc » ('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/event_router_forwarder_unittest.cc b/chrome/browser/extensions/event_router_forwarder_unittest.cc
index e8172f768952ea4af75b4a08170f9cd7111be951..495c419fc08d0fdb4faa192f03410eb5fa602da5 100644
--- a/chrome/browser/extensions/event_router_forwarder_unittest.cc
+++ b/chrome/browser/extensions/event_router_forwarder_unittest.cc
@@ -128,10 +128,10 @@ TEST_F(EventRouterForwarderTest, BroadcastRendererUI) {
scoped_refptr<MockEventRouterForwarder> event_router(
new MockEventRouterForwarder);
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, "", kEventName, profile1_, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, "", kEventName, profile2_, url));
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, "", kEventName, profile1_, url));
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile2_, "", kEventName, profile2_, url));
BroadcastEventToRenderers(event_router.get(), kEventName, url);
}
@@ -141,12 +141,12 @@ TEST_F(EventRouterForwarderTest, BroadcastRendererUIIncognito) {
using ::testing::_;
GURL url;
Profile* incognito = CreateIncognitoProfile(profile1_);
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, "", kEventName, profile1_, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(incognito, _, _, _, _)).Times(0);
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, "", kEventName, profile2_, url));
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, "", kEventName, profile1_, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(incognito, _, _, _, _))
+ .Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile2_, "", kEventName, profile2_, url));
BroadcastEventToRenderers(event_router.get(), kEventName, url);
}
@@ -157,10 +157,10 @@ TEST_F(EventRouterForwarderTest, BroadcastRendererIO) {
scoped_refptr<MockEventRouterForwarder> event_router(
new MockEventRouterForwarder);
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, "", kEventName, profile1_, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, "", kEventName, profile2_, url));
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, "", kEventName, profile1_, url));
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile2_, "", kEventName, profile2_, url));
BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
base::Bind(
&BroadcastEventToRenderers, base::Unretained(event_router.get()),
@@ -180,10 +180,10 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIRestricted) {
new MockEventRouterForwarder);
using ::testing::_;
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, "", kEventName, profile1_, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, "", kEventName, profile1_, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+ .Times(0);
DispatchEventToRenderers(event_router.get(), kEventName, profile1_, true,
url);
}
@@ -194,12 +194,12 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIRestrictedIncognito1) {
Profile* incognito = CreateIncognitoProfile(profile1_);
using ::testing::_;
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, "", kEventName, profile1_, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(incognito, _, _, _, _)).Times(0);
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, "", kEventName, profile1_, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(incognito, _, _, _, _))
+ .Times(0);
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+ .Times(0);
DispatchEventToRenderers(event_router.get(), kEventName, profile1_, true,
url);
}
@@ -210,12 +210,12 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIRestrictedIncognito2) {
Profile* incognito = CreateIncognitoProfile(profile1_);
using ::testing::_;
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, _, _, _, _)).Times(0);
- EXPECT_CALL(*event_router,
- CallEventRouter(incognito, "", kEventName, incognito, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile1_, _, _, _, _))
+ .Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(incognito, "", kEventName, incognito, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+ .Times(0);
DispatchEventToRenderers(event_router.get(), kEventName, incognito, true,
url);
}
@@ -225,10 +225,10 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIUnrestricted) {
new MockEventRouterForwarder);
using ::testing::_;
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, "", kEventName, NULL, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, "", kEventName, NULL, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+ .Times(0);
DispatchEventToRenderers(event_router.get(), kEventName, profile1_, false,
url);
}
@@ -239,12 +239,12 @@ TEST_F(EventRouterForwarderTest, UnicastRendererUIUnrestrictedIncognito) {
Profile* incognito = CreateIncognitoProfile(profile1_);
using ::testing::_;
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, "", kEventName, NULL, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(incognito, _, _, _, _)).Times(0);
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, "", kEventName, NULL, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(incognito, _, _, _, _))
+ .Times(0);
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+ .Times(0);
DispatchEventToRenderers(event_router.get(), kEventName, profile1_, false,
url);
}
@@ -253,10 +253,10 @@ TEST_F(EventRouterForwarderTest, BroadcastExtensionUI) {
scoped_refptr<MockEventRouterForwarder> event_router(
new MockEventRouterForwarder);
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, kExt, kEventName, profile2_, url));
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile2_, kExt, kEventName, profile2_, url));
BroadcastEventToExtension(event_router.get(), kExt, kEventName, url);
}
@@ -265,10 +265,10 @@ TEST_F(EventRouterForwarderTest, UnicastExtensionUIRestricted) {
new MockEventRouterForwarder);
using ::testing::_;
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, kExt, kEventName, profile1_, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+ .Times(0);
DispatchEventToExtension(event_router.get(), kExt, kEventName, profile1_,
true, url);
}
@@ -278,10 +278,10 @@ TEST_F(EventRouterForwarderTest, UnicastExtensionUIUnrestricted) {
new MockEventRouterForwarder);
using ::testing::_;
GURL url;
- EXPECT_CALL(*event_router,
- CallEventRouter(profile1_, kExt, kEventName, NULL, url));
- EXPECT_CALL(*event_router,
- CallEventRouter(profile2_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*event_router.get(),
+ CallEventRouter(profile1_, kExt, kEventName, NULL, url));
+ EXPECT_CALL(*event_router.get(), CallEventRouter(profile2_, _, _, _, _))
+ .Times(0);
DispatchEventToExtension(event_router.get(), kExt, kEventName, profile1_,
false, url);
}
« no previous file with comments | « chrome/browser/extensions/crx_installer.cc ('k') | chrome/browser/extensions/extension_action_icon_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698