Move Singleton and related structs to namespace base

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

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_APP_HELPER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_APP_HELPER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 35 matching lines @@
   // |profile|.
   void SetAppLaunchOrdinalForApp(
       Profile* profile,
       const std::string& name,
       const syncer::StringOrdinal& app_launch_ordinal);
 
   // Fix any NTP icon collisions that are currently in |profile|.
   void FixNTPOrdinalCollisions(Profile* profile);
 
  private:
-  friend struct DefaultSingletonTraits<SyncAppHelper>;
+  friend struct base::DefaultSingletonTraits<SyncAppHelper>;
 
   SyncAppHelper();
   ~SyncAppHelper();
 
   bool setup_completed_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncAppHelper);
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_SYNC_APP_HELPER_H_