[Extensions] Fix chrome url override settings

chrome/browser/extensions/extension_web_ui_unittest.cc

 // Copyright 2014 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/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
+#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 namespace extensions {
 
+namespace {
+
+scoped_ptr<KeyedService> BuildOverrideRegistrar(
+    content::BrowserContext* context) {
+  return make_scoped_ptr(new ExtensionWebUIOverrideRegistrar(context));
+}
+
+}  // namespace
+
 class ExtensionWebUITest : public testing::Test {
  public:
   ExtensionWebUITest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_) {}
 
  protected:
   void SetUp() override {
     profile_.reset(new TestingProfile());
     TestExtensionSystem* system =
         static_cast<TestExtensionSystem*>(ExtensionSystem::Get(profile_.get()));
     extension_service_ = system->CreateExtensionService(
         base::CommandLine::ForCurrentProcess(), base::FilePath(), false);
+    ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->SetTestingFactory(
+        profile_.get(), &BuildOverrideRegistrar);
+    ExtensionWebUIOverrideRegistrar::GetFactoryInstance()->Get(profile_.get());
   }
 
   void TearDown() override {
     profile_.reset();
     message_loop_.RunUntilIdle();
   }
 
   scoped_ptr<TestingProfile> profile_;
   ExtensionService* extension_service_;
   base::MessageLoop message_loop_;
@@ skipping 54 matching lines @@
 
   // Unregister non-component extension. Only component extension remaining.
   ExtensionWebUI::UnregisterChromeURLOverrides(
       profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get()));
   url = GURL("chrome://bookmarks");
   EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get()));
   EXPECT_EQ(url, expected_component_override_url);
 
   // This time the non-component extension was registered more recently and
   // should still take precedence.
-  ExtensionWebUI::RegisterChromeURLOverrides(
+  ExtensionWebUI::RegisterOrActivateChromeURLOverrides(
       profile_.get(), URLOverrides::GetChromeURLOverrides(ext_unpacked.get()));
   url = GURL("chrome://bookmarks");
   EXPECT_TRUE(ExtensionWebUI::HandleChromeURLOverride(&url, profile_.get()));
   EXPECT_EQ(url, expected_unpacked_override_url);
 }
 
 }  // namespace extensions