[base] Move AutoReset to base namespace.

NOTRY=true
R=darin@chromium.org
BUG=None


Review URL: https://chromiumcodereview.appspot.com/11308132

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168978 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index e10e5b8..5ca0d7f 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -935,7 +935,7 @@ void TemplateURLService::OnPreferenceChanged(PrefServiceBase* service,
       prefs->GetString(prefs::kSyncedDefaultSearchProviderGUID));
   if (new_default_search && !is_default_search_managed_) {
     if (new_default_search != GetDefaultSearchProvider()) {
-      AutoReset<DefaultSearchChangeOrigin> change_origin(
+      base::AutoReset<DefaultSearchChangeOrigin> change_origin(
           &dsp_change_origin_, DSP_CHANGE_SYNC_PREF);
       SetDefaultSearchProvider(new_default_search);
       pending_synced_default_search_ = false;
@@ -980,12 +980,12 @@ syncer::SyncError TemplateURLService::ProcessSyncChanges(
   }
   DCHECK(loaded_);
 
-  AutoReset<bool> processing_changes(&processing_syncer_changes_, true);
+  base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true);
 
   // We've started syncing, so set our origin member to the base Sync value.
   // As we move through Sync Code, we may set this to increasingly specific
   // origins so we can tell what exactly caused a DSP change.
-  AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_,
+  base::AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_,
       DSP_CHANGE_SYNC_UNINTENTIONAL);
 
   syncer::SyncChangeList new_changes;
@@ -1138,12 +1138,12 @@ syncer::SyncMergeResult TemplateURLService::MergeDataAndStartSyncing(
 
   // We do a lot of calls to Add/Remove/ResetTemplateURL here, so ensure we
   // don't step on our own toes.
-  AutoReset<bool> processing_changes(&processing_syncer_changes_, true);
+  base::AutoReset<bool> processing_changes(&processing_syncer_changes_, true);
 
   // We've started syncing, so set our origin member to the base Sync value.
   // As we move through Sync Code, we may set this to increasingly specific
   // origins so we can tell what exactly caused a DSP change.
-  AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_,
+  base::AutoReset<DefaultSearchChangeOrigin> change_origin(&dsp_change_origin_,
       DSP_CHANGE_SYNC_UNINTENTIONAL);
 
   syncer::SyncChangeList new_changes;
@@ -1213,7 +1213,7 @@ syncer::SyncMergeResult TemplateURLService::MergeDataAndStartSyncing(
   // above, set it now.
   TemplateURL* pending_default = GetPendingSyncedDefaultSearchProvider();
   if (pending_default) {
-    AutoReset<DefaultSearchChangeOrigin> change_origin(
+    base::AutoReset<DefaultSearchChangeOrigin> change_origin(
         &dsp_change_origin_, DSP_CHANGE_SYNC_ADD);
     SetDefaultSearchProvider(pending_default);
   }
@@ -2113,7 +2113,7 @@ void TemplateURLService::UpdateDefaultSearch() {
     // Otherwise, it should be FindNewDefaultSearchProvider.
     TemplateURL* synced_default = GetPendingSyncedDefaultSearchProvider();
     if (synced_default) {
-      AutoReset<DefaultSearchChangeOrigin> change_origin(
+      base::AutoReset<DefaultSearchChangeOrigin> change_origin(
           &dsp_change_origin_, DSP_CHANGE_SYNC_NOT_MANAGED);
       pending_synced_default_search_ = false;
     }
@@ -2517,7 +2517,7 @@ void TemplateURLService::SetDefaultSearchProviderIfNewlySynced(
     // really just added this TemplateURL.
     TemplateURL* turl_from_sync = GetTemplateURLForGUID(guid);
     if (turl_from_sync && turl_from_sync->SupportsReplacement()) {
-      AutoReset<DefaultSearchChangeOrigin> change_origin(
+      base::AutoReset<DefaultSearchChangeOrigin> change_origin(
           &dsp_change_origin_, DSP_CHANGE_SYNC_ADD);
       SetDefaultSearchProvider(turl_from_sync);
     }