Use chromeos::CrosLibrary::Get()->EnsureLoaded() to replace chromeos::LoadLibcros()

chrome/browser/extensions/extension_input_ui_api.cc

 // Copyright (c) 2011 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/extensions/extension_input_ui_api.h"
 
 #include <string>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/profiles/profile.h"
 #include "third_party/cros/chromeos_cros_api.h"
 #include "third_party/cros/chromeos_input_method_ui.h"
 
 namespace events {
 
 const char kOnUpdateAuxiliaryText[] =
     "experimental.inputUI.onUpdateAuxiliaryText";
 const char kOnUpdateLookupTable[] = "experimental.inputUI.onUpdateLookupTable";
@@ skipping 47 matching lines @@
   ExtensionInputUiEventRouter* router_;
   chromeos::InputMethodUiStatusConnection* ui_status_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(InputUiController);
 };
 
 InputUiController::InputUiController(
     ExtensionInputUiEventRouter* router) :
   router_(router),
   ui_status_connection_(NULL) {
-  std::string error;
-  chromeos::LoadLibcros(NULL, error);
+  if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
+    return;
 
   chromeos::InputMethodUiStatusMonitorFunctions functions;
   functions.hide_auxiliary_text =
       &InputUiController::OnHideAuxiliaryText;
   functions.hide_lookup_table =
       &InputUiController::OnHideLookupTable;
   functions.set_cursor_location =
       &InputUiController::OnSetCursorLocation;
   functions.update_auxiliary_text =
       &InputUiController::OnUpdateAuxiliaryText;
   functions.update_lookup_table =
       &InputUiController::OnUpdateLookupTable;
   ui_status_connection_ = chromeos::MonitorInputMethodUiStatus(functions, this);
 
   if (!ui_status_connection_)
     LOG(ERROR) << "chromeos::MonitorInputMethodUiStatus() failed!";
 }
 
 InputUiController::~InputUiController() {
-  chromeos::DisconnectInputMethodUiStatus(ui_status_connection_);
+  if (ui_status_connection_)
+    chromeos::DisconnectInputMethodUiStatus(ui_status_connection_);
 }
 
 void InputUiController::CandidateClicked(
     int index, int button, int flags) {
   chromeos::NotifyCandidateClicked(ui_status_connection_, index, button, flags);
 }
 
 void InputUiController::CursorUp() {
   chromeos::NotifyCursorUp(ui_status_connection_);
 }
@@ skipping 230 matching lines @@
       profile(), extension_id());
   return true;
 }
 
 bool PageDownInputUiFunction::RunImpl() {
   ExtensionInputUiEventRouter::GetInstance()->PageDown(
       profile(), extension_id());
   return true;
 }