Convert FileRefImpl and URLRequestInfo to shared_impl.

webkit/plugins/ppapi/url_request_info_unittest.cc

Index: webkit/plugins/ppapi/url_request_info_unittest.cc
diff --git a/webkit/plugins/ppapi/url_request_info_unittest.cc b/webkit/plugins/ppapi/url_request_info_unittest.cc
index adeffca252199f398584016e0cfb398c68fe4122..b43bbc9511ec49210a70bfe853308694bd03fbc6 100644
--- a/webkit/plugins/ppapi/url_request_info_unittest.cc
+++ b/webkit/plugins/ppapi/url_request_info_unittest.cc
@@ -90,6 +90,13 @@ class URLRequestInfoTest : public PpapiUnittest {
     return web_request.httpHeaderField(WebString::fromUTF8(field));
   }
 
+  bool SetBooleanProperty(PP_URLRequestProperty prop, bool b) {
+    info_->SetBooleanProperty(prop, b);
+  }
+  bool SetStringProperty(PP_URLRequestProperty prop, const std::string& s) {
+    info_->SetStringProperty(prop, s);
+  }
+
   scoped_refptr<PPB_URLRequestInfo_Impl> info_;
 
   static TestWebFrameClient web_frame_client_;
@@ -119,15 +126,15 @@ TEST_F(URLRequestInfoTest, AsURLRequestInfo) {
 }
 
 TEST_F(URLRequestInfoTest, StreamToFile) {
-  info_->SetStringProperty(PP_URLREQUESTPROPERTY_URL, "http://www.google.com");
+  SetStringProperty(PP_URLREQUESTPROPERTY_URL, "http://www.google.com");
 
   ASSERT_FALSE(GetDownloadToFile());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_STREAMTOFILE, true));
   ASSERT_TRUE(GetDownloadToFile());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_STREAMTOFILE, false));
   ASSERT_FALSE(GetDownloadToFile());
 }
@@ -135,11 +142,11 @@ TEST_F(URLRequestInfoTest, StreamToFile) {
 TEST_F(URLRequestInfoTest, FollowRedirects) {
   ASSERT_TRUE(info_->follow_redirects());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_FOLLOWREDIRECTS, false));
   ASSERT_FALSE(info_->follow_redirects());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_FOLLOWREDIRECTS, true));
   ASSERT_TRUE(info_->follow_redirects());
 }
@@ -147,11 +154,11 @@ TEST_F(URLRequestInfoTest, FollowRedirects) {
 TEST_F(URLRequestInfoTest, RecordDownloadProgress) {
   ASSERT_FALSE(info_->record_download_progress());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_RECORDDOWNLOADPROGRESS, true));
   ASSERT_TRUE(info_->record_download_progress());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_RECORDDOWNLOADPROGRESS, false));
   ASSERT_FALSE(info_->record_download_progress());
 }
@@ -159,11 +166,11 @@ TEST_F(URLRequestInfoTest, RecordDownloadProgress) {
 TEST_F(URLRequestInfoTest, RecordUploadProgress) {
   ASSERT_FALSE(info_->record_upload_progress());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_RECORDUPLOADPROGRESS, true));
   ASSERT_TRUE(info_->record_upload_progress());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_RECORDUPLOADPROGRESS, false));
   ASSERT_FALSE(info_->record_upload_progress());
 }
@@ -171,11 +178,11 @@ TEST_F(URLRequestInfoTest, RecordUploadProgress) {
 TEST_F(URLRequestInfoTest, AllowCrossOriginRequests) {
   ASSERT_FALSE(info_->allow_cross_origin_requests());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_ALLOWCROSSORIGINREQUESTS, true));
   ASSERT_TRUE(info_->allow_cross_origin_requests());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_ALLOWCROSSORIGINREQUESTS, false));
   ASSERT_FALSE(info_->allow_cross_origin_requests());
 }
@@ -183,11 +190,11 @@ TEST_F(URLRequestInfoTest, AllowCrossOriginRequests) {
 TEST_F(URLRequestInfoTest, AllowCredentials) {
   ASSERT_FALSE(info_->allow_credentials());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_ALLOWCREDENTIALS, true));
   ASSERT_TRUE(info_->allow_credentials());
 
-  ASSERT_TRUE(info_->SetBooleanProperty(
+  ASSERT_TRUE(SetBooleanProperty(
       PP_URLREQUESTPROPERTY_ALLOWCREDENTIALS, false));
   ASSERT_FALSE(info_->allow_credentials());
 }
@@ -197,7 +204,7 @@ TEST_F(URLRequestInfoTest, SetURL) {
   ASSERT_TRUE(IsExpected(GetURL(), "about:blank"));
 
   const char* url = "http://www.google.com/";
-  ASSERT_TRUE(info_->SetStringProperty(
+  ASSERT_TRUE(SetStringProperty(
       PP_URLREQUESTPROPERTY_URL, url));
   ASSERT_TRUE(IsExpected(GetURL(), url));
 }
@@ -205,41 +212,41 @@ TEST_F(URLRequestInfoTest, SetURL) {
 TEST_F(URLRequestInfoTest, JavascriptURL) {
   const char* url = "javascript:foo = bar";
   ASSERT_FALSE(info_->RequiresUniversalAccess());
-  info_->SetStringProperty(PP_URLREQUESTPROPERTY_URL, url);
+  SetStringProperty(PP_URLREQUESTPROPERTY_URL, url);
   ASSERT_TRUE(info_->RequiresUniversalAccess());
 }
 
 TEST_F(URLRequestInfoTest, SetMethod) {
   // Test default method is "GET".
   ASSERT_TRUE(IsExpected(GetMethod(), "GET"));
-  ASSERT_TRUE(info_->SetStringProperty(
+  ASSERT_TRUE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "POST"));
   ASSERT_TRUE(IsExpected(GetMethod(), "POST"));
 
   // Test that method names are converted to upper case.
-  ASSERT_TRUE(info_->SetStringProperty(
+  ASSERT_TRUE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "get"));
   ASSERT_TRUE(IsExpected(GetMethod(), "GET"));
-  ASSERT_TRUE(info_->SetStringProperty(
+  ASSERT_TRUE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "post"));
   ASSERT_TRUE(IsExpected(GetMethod(), "POST"));
 }
 
 TEST_F(URLRequestInfoTest, SetInvalidMethod) {
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "CONNECT"));
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "connect"));
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "TRACE"));
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "trace"));
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "TRACK"));
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "track"));
 
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_METHOD, "POST\x0d\x0ax-csrf-token:\x20test1234"));
 }
 
@@ -248,12 +255,12 @@ TEST_F(URLRequestInfoTest, SetValidHeaders) {
   ASSERT_TRUE(IsExpected(
       GetHeaderValue("foo"), ""));
   // Test that we can set a header field.
-  ASSERT_TRUE(info_->SetStringProperty(
+  ASSERT_TRUE(SetStringProperty(
       PP_URLREQUESTPROPERTY_HEADERS, "foo: bar"));
   ASSERT_TRUE(IsExpected(
       GetHeaderValue("foo"), "bar"));
   // Test that we can set multiple header fields using \n delimiter.
-  ASSERT_TRUE(info_->SetStringProperty(
+  ASSERT_TRUE(SetStringProperty(
       PP_URLREQUESTPROPERTY_HEADERS, "foo: bar\nbar: baz"));
   ASSERT_TRUE(IsExpected(
       GetHeaderValue("foo"), "bar"));
@@ -291,18 +298,18 @@ TEST_F(URLRequestInfoTest, SetInvalidHeaders) {
   for (size_t i = 0; i < arraysize(kForbiddenHeaderFields); ++i) {
     std::string headers(kForbiddenHeaderFields[i]);
     headers.append(": foo");
-    ASSERT_FALSE(info_->SetStringProperty(
+    ASSERT_FALSE(SetStringProperty(
         PP_URLREQUESTPROPERTY_HEADERS, headers.c_str()));
     ASSERT_TRUE(IsNullOrEmpty(GetHeaderValue(kForbiddenHeaderFields[i])));
   }
 
   // Test that forbidden header can't be set in various ways.
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_HEADERS, "cookie : foo"));
   ASSERT_TRUE(IsNullOrEmpty(GetHeaderValue("cookie")));
 
   // Test that forbidden header can't be set with an allowed one.
-  ASSERT_FALSE(info_->SetStringProperty(
+  ASSERT_FALSE(SetStringProperty(
       PP_URLREQUESTPROPERTY_HEADERS, "foo: bar\ncookie: foo"));
   ASSERT_TRUE(IsNullOrEmpty(GetHeaderValue("cookie")));
 }