Revert 188912 "Removed static factories for data, ftp, file, and..."

trunk/src/content/browser/browser_plugin/browser_plugin_host_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/run_loop.h"
 #include "base/string_util.h"
 #include "base/strings/string_split.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/browser_plugin/test_browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/test_browser_plugin_guest.h"
 #include "content/browser/browser_plugin/test_browser_plugin_guest_manager.h"
-#include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host_observer.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
@@ skipping 818 matching lines @@
         test_embedder()->web_contents()->GetRenderViewHost());
     GURL test_url = test_server()->GetURL("close-socket");
     ExecuteSyncJSFunction(
         rvh, base::StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   {
     // Navigate the guest to an illegal chrome:// URL.
-    GURL test_url("chrome://newtab");
-    ChildProcessSecurityPolicyImpl* policy =
-        ChildProcessSecurityPolicyImpl::GetInstance();
-    // Register chrome:// as a safe scheme so as to bypass
-    // ChildProcessSecurityPolicyImpl::CanRequestURL().
-    if (!policy->IsWebSafeScheme(test_url.scheme()))
-      policy->RegisterWebSafeScheme(test_url.scheme());
     const string16 expected_title = ASCIIToUTF16("ERR_INVALID_URL");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
     RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
         test_embedder()->web_contents()->GetRenderViewHost());
+    GURL test_url("chrome://newtab");
     ExecuteSyncJSFunction(
         rvh, base::StringPrintf("SetSrc('%s');", test_url.spec().c_str()));
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 
   {
     // Navigate the guest to an illegal file:// URL.
     const string16 expected_title = ASCIIToUTF16("ERR_ABORTED");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
@@ skipping 520 matching lines @@
     const string16 expected_title = ASCIIToUTF16("AutoSize(640, 480)");
     content::TitleWatcher title_watcher(test_embedder()->web_contents(),
                                         expected_title);
     RemoveAttributes(rvh, "maxwidth");
     string16 actual_title = title_watcher.WaitAndGetTitle();
     EXPECT_EQ(expected_title, actual_title);
   }
 }
 
 }  // namespace content