Move Singleton and related structs to namespace base

chrome/browser/sync/test/integration/sync_extension_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_extension_helper.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/guid.h"
 #include "base/logging.h"
@@ skipping 34 matching lines @@
 
 bool SyncExtensionHelper::ExtensionState::Equals(
     const SyncExtensionHelper::ExtensionState &other) const {
   return ((enabled_state == other.enabled_state) &&
           (disable_reasons == other.disable_reasons) &&
           (incognito_enabled == other.incognito_enabled));
 }
 
 // static
 SyncExtensionHelper* SyncExtensionHelper::GetInstance() {
-  SyncExtensionHelper* instance = Singleton<SyncExtensionHelper>::get();
+  SyncExtensionHelper* instance = base::Singleton<SyncExtensionHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
 
 SyncExtensionHelper::SyncExtensionHelper() : setup_completed_(false) {}
 
 SyncExtensionHelper::~SyncExtensionHelper() {}
 
 void SyncExtensionHelper::SetupIfNecessary(SyncTest* test) {
   if (setup_completed_)
@@ skipping 363 matching lines @@
     EXPECT_EQ(expected_id, extension->id());
     return NULL;
   }
   DVLOG(2) << "created extension with name = "
            << name << ", id = " << expected_id;
   (it->second)[name] = extension;
   id_to_name_[expected_id] = name;
   id_to_type_[expected_id] = type;
   return extension;
 }