Move Singleton and related structs to namespace base

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

 // Copyright (c) 2012 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_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/launch_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
@@ skipping 98 matching lines @@
        id != pending_crx_ids.end(); ++id) {
     LoadApp(profile, *id, &(app_state_map[*id]));
   }
 
   return app_state_map;
 }
 
 }  // namespace
 
 SyncAppHelper* SyncAppHelper::GetInstance() {
-  SyncAppHelper* instance = Singleton<SyncAppHelper>::get();
+  SyncAppHelper* instance = base::Singleton<SyncAppHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
 
 void SyncAppHelper::SetupIfNecessary(SyncTest* test) {
   if (setup_completed_)
     return;
 
   for (int i = 0; i < test->num_clients(); ++i) {
     extensions::ExtensionSystem::Get(
@@ skipping 81 matching lines @@
       crx_file::id_util::GenerateId(name), app_launch_ordinal);
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
   ExtensionPrefs::Get(profile)->app_sorting()->FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}