Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

base/time_mac.cc

 // Copyright (c) 2008 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 "base/time.h"
 
 #include <CoreFoundation/CFDate.h>
 #include <CoreFoundation/CFTimeZone.h>
 #include <mach/mach_time.h>
 #include <sys/time.h>
 #include <time.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 
 namespace base {
 
 // The Time routines in this file use Mach and CoreFoundation APIs, since the
 // POSIX definition of time_t in Mac OS X wraps around after 2038--and
 // there are already cookie expiration dates, etc., past that time out in
 // the field.  Using CFDate prevents that problem, and using mach_absolute_time
 // for TimeTicks gives us nice high-resolution interval timing.
 
 // Time -----------------------------------------------------------------------
@@ skipping 37 matching lines @@
 Time Time::FromExploded(bool is_local, const Exploded& exploded) {
   CFGregorianDate date;
   date.second = exploded.second +
       exploded.millisecond / static_cast<double>(kMillisecondsPerSecond);
   date.minute = exploded.minute;
   date.hour = exploded.hour;
   date.day = exploded.day_of_month;
   date.month = exploded.month;
   date.year = exploded.year;
 
-  scoped_cftyperef<CFTimeZoneRef>
+  base::mac::ScopedCFTypeRef<CFTimeZoneRef>
       time_zone(is_local ? CFTimeZoneCopySystem() : NULL);
   CFAbsoluteTime seconds = CFGregorianDateGetAbsoluteTime(date, time_zone) +
       kCFAbsoluteTimeIntervalSince1970;
   return Time(static_cast<int64>(seconds * kMicrosecondsPerSecond) +
       kWindowsEpochDeltaMicroseconds);
 }
 
 void Time::Explode(bool is_local, Exploded* exploded) const {
   CFAbsoluteTime seconds =
       (static_cast<double>((us_ - kWindowsEpochDeltaMicroseconds) /
       kMicrosecondsPerSecond) - kCFAbsoluteTimeIntervalSince1970);
 
-  scoped_cftyperef<CFTimeZoneRef>
+  base::mac::ScopedCFTypeRef<CFTimeZoneRef>
       time_zone(is_local ? CFTimeZoneCopySystem() : NULL);
   CFGregorianDate date = CFAbsoluteTimeGetGregorianDate(seconds, time_zone);
 
   exploded->year = date.year;
   exploded->month = date.month;
   exploded->day_of_month = date.day;
   exploded->hour = date.hour;
   exploded->minute = date.minute;
   exploded->second = date.second;
   exploded->millisecond  =
@@ skipping 33 matching lines @@
 
   return TimeTicks(absolute_micro);
 }
 
 // static
 TimeTicks TimeTicks::HighResNow() {
   return Now();
 }
 
 }  // namespace base