Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor…

content/browser/web_contents/web_contents_impl_unittest.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/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
@@ skipping 235 matching lines @@
         io_thread_(BrowserThread::IO, &message_loop_) {
   }
 
   virtual void SetUp() {
     RenderViewHostImplTestHarness::SetUp();
     WebUIControllerFactory::RegisterFactory(&factory_);
   }
 
   virtual void TearDown() {
     RenderViewHostImplTestHarness::TearDown();
-    WebUIControllerFactoryRegistry::UnregisterFactoryForTesting(&factory_);
+    WebUIControllerFactory::UnregisterFactoryForTesting(&factory_);
   }
 
  private:
   WebContentsImplTestWebUIControllerFactory factory_;
   TestBrowserThread ui_thread_;
   TestBrowserThread file_user_blocking_thread_;
   TestBrowserThread io_thread_;
 };
 
 class TestWebContentsObserver : public WebContentsObserver {
@@ skipping 1710 matching lines @@
   other_contents->NavigateAndCommit(url_normalized);
 
   // Check that an IPC with about:whatever is correctly normalized.
   other_contents->TestDidFailLoadWithError(
       1, url_from_ipc, true, 1, string16());
   EXPECT_EQ(url_normalized, other_observer.last_url());
 }
 
 
 }  // namespace content