Move Singleton and related structs to namespace base

chrome/browser/sync/test/integration/sync_app_list_helper.cc

 // Copyright 2013 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/sync/test/integration/sync_app_list_helper.h"
 
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 
 using app_list::AppListFolderItem;
 using app_list::AppListItem;
 using app_list::AppListItemList;
 using app_list::AppListSyncableService;
 using app_list::AppListSyncableServiceFactory;
 
 SyncAppListHelper* SyncAppListHelper::GetInstance() {
-  SyncAppListHelper* instance = Singleton<SyncAppListHelper>::get();
+  SyncAppListHelper* instance = base::Singleton<SyncAppListHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
 
 SyncAppListHelper::SyncAppListHelper() : test_(NULL), setup_completed_(false) {}
 
 SyncAppListHelper::~SyncAppListHelper() {}
 
 void SyncAppListHelper::SetupIfNecessary(SyncTest* test) {
   if (setup_completed_) {
@@ skipping 145 matching lines @@
           base::StringPrintf(" Folder Item(%d): ", static_cast<int>(i));
       PrintItem(profile, child, child_label);
     }
     return;
   }
   DVLOG(1) << label << item->ToDebugString()
            << " Page: " << s->GetPageOrdinal(id).ToDebugString().substr(0, 8)
            << " Item: "
            << s->GetAppLaunchOrdinal(id).ToDebugString().substr(0, 8);
 }