Move base/mac_util.h to base/mac and use the base::mac namespace....

chrome/browser/importer/importer_list.cc

 // Copyright (c) 2010 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/importer/importer_list.h"
 
 #include "app/l10n_util.h"
 #include "base/file_util.h"
 #include "base/stl_util-inl.h"
 #include "base/values.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/importer/firefox2_importer.h"
 #include "chrome/browser/importer/firefox3_importer.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/toolbar_importer.h"
 #include "chrome/browser/shell_integration.h"
 #include "grit/generated_resources.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/password_manager/ie7_password.h"
 #endif
 #if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
 #include "chrome/browser/importer/safari_importer.h"
 #endif
 
 namespace {
 
 #if defined(OS_WIN)
 void DetectIEProfiles(std::vector<importer::ProfileInfo*>* profiles) {
     // IE always exists and doesn't have multiple profiles.
   ProfileInfo* ie = new ProfileInfo();
   ie->description = l10n_util::GetString(IDS_IMPORT_FROM_IE);
   ie->browser_type = importer::MS_IE;
   ie->source_path.clear();
   ie->app_path.clear();
   ie->services_supported = importer::HISTORY | importer::FAVORITES |
       importer::COOKIES | importer::PASSWORDS | importer::SEARCH_ENGINES;
   profiles->push_back(ie);
 }
 #endif  // defined(OS_WIN)
 
 #if defined(OS_MACOSX)
 void DetectSafariProfiles(std::vector<importer::ProfileInfo*>* profiles) {
   uint16 items = importer::NONE;
-  if (!SafariImporter::CanImport(mac_util::GetUserLibraryPath(), &items))
+  if (!SafariImporter::CanImport(base::mac::GetUserLibraryPath(), &items))
     return;
 
   importer::ProfileInfo* safari = new importer::ProfileInfo();
   safari->browser_type = importer::SAFARI;
   safari->description =
       UTF16ToWideHack(l10n_util::GetStringUTF16(IDS_IMPORT_FROM_SAFARI));
   safari->source_path.clear();
   safari->app_path.clear();
   safari->services_supported = items;
   profiles->push_back(safari);
@@ skipping 66 matching lines @@
 #endif
     case importer::BOOKMARKS_HTML:
     case importer::FIREFOX2:
       return new Firefox2Importer();
     case importer::FIREFOX3:
       return new Firefox3Importer();
     case importer::GOOGLE_TOOLBAR5:
       return new Toolbar5Importer();
 #if defined(OS_MACOSX)
     case importer::SAFARI:
-      return new SafariImporter(mac_util::GetUserLibraryPath());
+      return new SafariImporter(base::mac::GetUserLibraryPath());
 #endif  // OS_MACOSX
     case importer::NO_PROFILE_TYPE:
       NOTREACHED();
       return NULL;
   }
   NOTREACHED();
   return NULL;
 }
 
 ImporterList::ImporterList()
@@ skipping 108 matching lines @@
   BrowserThread::ID current_thread_id;
   BrowserThread::GetCurrentThreadIdentifier(&current_thread_id);
   DCHECK_EQ(current_thread_id, source_thread_id_);
 
   source_profiles_->assign(profiles.begin(), profiles.end());
   source_profiles_loaded_ = true;
   observer_->SourceProfilesLoaded();
   observer_ = NULL;
   source_thread_id_ = BrowserThread::UI;
 }