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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/renderer/chrome_content_renderer_client_unittest.cc

Issue 15984016: Call scoped_refptr<T>::get() rather than relying on implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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/nacl/nacl_listener.cc ('k') | chrome/service/cloud_print/cloud_print_auth.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_content_renderer_client_unittest.cc
diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc
index d3429fd5533d85a543f0044700ebec328d1fc9e0..65ee47246ea925db7f05b2542d86b29d8d7af496 100644
--- a/chrome/renderer/chrome_content_renderer_client_unittest.cc
+++ b/chrome/renderer/chrome_content_renderer_client_unittest.cc
@@ -126,8 +126,10 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL(), kNaClUnrestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ GURL(),
+ GURL(),
+ kNaClUnrestricted,
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_TRUE(AllowsDevInterfaces(params));
}
@@ -136,8 +138,11 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL(kExtensionUrl), kNaClRestricted,
- CreateExtension(kExtensionUnrestricted, kExtensionNotFromWebStore),
+ GURL(),
+ GURL(kExtensionUrl),
+ kNaClRestricted,
+ CreateExtension(kExtensionUnrestricted, kExtensionNotFromWebStore)
+ .get(),
&params));
EXPECT_TRUE(AllowsDevInterfaces(params));
}
@@ -146,8 +151,10 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL(kExtensionUrl), kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionFromWebStore),
+ GURL(),
+ GURL(kExtensionUrl),
+ kNaClRestricted,
+ CreateExtension(kExtensionRestricted, kExtensionFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
}
@@ -155,8 +162,10 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL(kExtensionUrl), kNaClUnrestricted,
- CreateExtension(kExtensionRestricted, kExtensionFromWebStore),
+ GURL(),
+ GURL(kExtensionUrl),
+ kNaClUnrestricted,
+ CreateExtension(kExtensionRestricted, kExtensionFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
}
@@ -166,8 +175,10 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
WebPluginParams params;
AddFakeDevAttribute(&params);
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL(kExtensionUrl), kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionFromWebStore),
+ GURL(),
+ GURL(kExtensionUrl),
+ kNaClRestricted,
+ CreateExtension(kExtensionRestricted, kExtensionFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
}
@@ -177,8 +188,9 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
GURL("chrome-extension://acadkphlmlegjaadjagenfimbpphcgnh"),
- GURL(), kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionFromWebStore),
+ GURL(),
+ kNaClRestricted,
+ CreateExtension(kExtensionRestricted, kExtensionFromWebStore).get(),
&params));
EXPECT_TRUE(AllowsDevInterfaces(params));
}
@@ -187,39 +199,45 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("http://plus.google.com/foo"),
+ GURL(),
+ GURL("http://plus.google.com/foo"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com/foo"),
+ GURL(),
+ GURL("https://plus.google.com/foo"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com/209089085730"),
+ GURL(),
+ GURL("https://plus.google.com/209089085730"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("http://plus.sandbox.google.com/foo"),
+ GURL(),
+ GURL("http://plus.sandbox.google.com/foo"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.sandbox.google.com/foo"),
+ GURL(),
+ GURL("https://plus.sandbox.google.com/foo"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com/209089085730"),
+ GURL(),
+ GURL("https://plus.google.com/209089085730"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
}
@@ -227,9 +245,10 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com/209089085730"),
+ GURL(),
+ GURL("https://plus.google.com/209089085730"),
kNaClUnrestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
}
@@ -239,9 +258,10 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
WebPluginParams params;
AddFakeDevAttribute(&params);
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com/209089085730"),
+ GURL(),
+ GURL("https://plus.google.com/209089085730"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(AllowsDevInterfaces(params));
}
@@ -249,40 +269,49 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
{
WebPluginParams params;
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com.evil.com/foo1"),
+ GURL(),
+ GURL("https://plus.google.com.evil.com/foo1"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionNotFromWebStore).get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com.evil.com/foo2"),
+ GURL(),
+ GURL("https://plus.google.com.evil.com/foo2"),
kNaClRestricted,
- CreateExtension(kExtensionRestricted, kExtensionFromWebStore),
+ CreateExtension(kExtensionRestricted, kExtensionFromWebStore).get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com.evil.com/foo3"),
+ GURL(),
+ GURL("https://plus.google.com.evil.com/foo3"),
kNaClRestricted,
- CreateExtension(kExtensionUnrestricted, kExtensionNotFromWebStore),
+ CreateExtension(kExtensionUnrestricted, kExtensionNotFromWebStore)
+ .get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("https://plus.google.com.evil.com/foo4"),
+ GURL(),
+ GURL("https://plus.google.com.evil.com/foo4"),
kNaClRestricted,
- CreateExtension(kExtensionUnrestricted, kExtensionFromWebStore),
+ CreateExtension(kExtensionUnrestricted, kExtensionFromWebStore).get(),
&params));
}
// Non chrome-extension:// URLs belonging to hosted apps are allowed.
{
WebPluginParams params;
EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("http://example.com/test.html"),
+ GURL(),
+ GURL("http://example.com/test.html"),
kNaClRestricted,
- CreateHostedApp(kExtensionRestricted, kExtensionNotFromWebStore,
- "http://example.com/"),
+ CreateHostedApp(kExtensionRestricted,
+ kExtensionNotFromWebStore,
+ "http://example.com/").get(),
&params));
EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
- GURL(), GURL("http://example.evil.com/test.html"),
+ GURL(),
+ GURL("http://example.evil.com/test.html"),
kNaClRestricted,
- CreateHostedApp(kExtensionRestricted, kExtensionNotFromWebStore,
- "http://example.com/"),
+ CreateHostedApp(kExtensionRestricted,
+ kExtensionNotFromWebStore,
+ "http://example.com/").get(),
&params));
}
}
« no previous file with comments | « chrome/nacl/nacl_listener.cc ('k') | chrome/service/cloud_print/cloud_print_auth.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698