Merge http://src.chromium.org/viewvc/chrome?view=rev&revision=125923 by

content/browser/tab_contents/tab_contents_unittest.cc

Index: content/browser/tab_contents/tab_contents_unittest.cc
===================================================================
--- content/browser/tab_contents/tab_contents_unittest.cc	(revision 126243)
+++ content/browser/tab_contents/tab_contents_unittest.cc	(working copy)
@@ -23,6 +23,7 @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/test_browser_thread.h"
+#include "googleurl/src/url_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ -231,6 +232,10 @@
   }
 
   virtual void SetUp() {
+    // These tests treat tabcontentstest as a privileged WebUI scheme.
+    // We must register it similarly to kChromeUIScheme.
+    url_util::AddStandardScheme("tabcontentstest");
+
     old_browser_client_ = content::GetContentClient()->browser();
     content::GetContentClient()->set_browser(&browser_client_);
     RenderViewHostTestHarness::SetUp();