cros: Cleanup lock screen and OOBE C++ backing code.

chrome/browser/chromeos/accessibility/accessibility_extension_loader.cc

 // Copyright 2016 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 "chrome/browser/chromeos/accessibility/accessibility_extension_loader.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/path_service.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
+#include "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 188 matching lines @@
                 done_cb);
 }
 
 void AccessibilityExtensionLoader::LoadToLockScreen(
     const base::Closure& done_cb) {
   if (loaded_on_lock_screen_)
     return;
 
   ScreenLocker* screen_locker = ScreenLocker::default_screen_locker();
   if (screen_locker && screen_locker->locked()) {
-    content::WebUI* lock_web_ui = screen_locker->GetAssociatedWebUI();
+    content::WebUI* lock_web_ui = screen_locker->web_ui()->GetWebUI();
     if (lock_web_ui) {
       Profile* profile = Profile::FromWebUI(lock_web_ui);
       loaded_on_lock_screen_ = true;
       LoadExtension(profile, lock_web_ui->GetWebContents()->GetRenderViewHost(),
                     done_cb);
     }
   }
 }
 
 //
@@ skipping 74 matching lines @@
         weak_ptr_factory_.GetWeakPtr(), extension_service,
         render_view_host->GetProcess()->GetID(),
         render_view_host->GetRoutingID(), done_cb);
   }
 
   extension_service->component_loader()->AddComponentFromDir(
       extension_path_, extension_id_.c_str(), done_cb);
 }
 
 }  // namespace chromeos