| Index: chrome/browser/dom_ui/conflicts_ui.cc
|
| diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc
|
| index 8e2bcae9553e6c5a2f6dfdc167c76f77c95a8bb2..ed51f217d1c3fe8c9e3d87c544e845b68faec82b 100644
|
| --- a/chrome/browser/dom_ui/conflicts_ui.cc
|
| +++ b/chrome/browser/dom_ui/conflicts_ui.cc
|
| @@ -142,11 +142,11 @@ void ConflictsDOMHandler::HandleRequestModuleList(const ListValue* args) {
|
| // This request is handled asynchronously. See Observe for when we reply back.
|
| registrar_.Add(this, NotificationType::MODULE_LIST_ENUMERATED,
|
| NotificationService::AllSources());
|
| - EnumerateModulesModel::GetSingleton()->ScanNow();
|
| + EnumerateModulesModel::GetInstance()->ScanNow();
|
| }
|
|
|
| void ConflictsDOMHandler::SendModuleList() {
|
| - EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetSingleton();
|
| + EnumerateModulesModel* loaded_modules = EnumerateModulesModel::GetInstance();
|
| ListValue* list = loaded_modules->GetModuleList();
|
| DictionaryValue results;
|
| results.Set("moduleList", list);
|
|
|