Added DataTypeController integration and UI surfacing for syncing Search Engines.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 653 matching lines @@
   }
 
   if (webkit_context_.get())
     webkit_context_->DeleteSessionOnlyData();
 
   StopCreateSessionServiceTimer();
 
   // Remove pref observers
   pref_change_registrar_.RemoveAll();
 
+  // The sync service needs to be deleted before the services it calls.
+  // TODO(sync): Make ProfileSyncService into a PKS and let the PDM take care of

[Sheridan Rawlins, 2011/08/25 08:19:16]

Shouldn't this be TODO(someone's ldap) ?

[SteveT, 2011/08/25 14:50:55]

The issue was assigned to the Sync PM, tmccoy, for triage, at the time this TODO
was authored. It looks like it's been reassigned to me now. I'll take ownership,
but keep in mind that this is a general sync change and not search engines
specific.

+  // the cleanup below.
+  sync_service_.reset();
+
   ProfileDependencyManager::GetInstance()->DestroyProfileServices(this);
 
   if (db_tracker_) {
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(
             db_tracker_.get(),
             &webkit_database::DatabaseTracker::Shutdown));
   }
 
   // DownloadManager is lazily created, so check before accessing it.
   if (download_manager_.get()) {
     // The download manager queries the history system and should be shut down
     // before the history is shut down so it can properly cancel all requests.
     download_manager_->Shutdown();
     download_manager_ = NULL;
   }
 
-  // The sync service needs to be deleted before the services it calls.
-  sync_service_.reset();
-
   // Password store uses WebDB, shut it down before the WebDB has been shutdown.
   if (password_store_.get())
     password_store_->Shutdown();
 
   // Both HistoryService and WebDataService maintain threads for background
   // processing. Its possible each thread still has tasks on it that have
   // increased the ref count of the service. In such a situation, when we
   // decrement the refcount, it won't be 0, and the threads/databases aren't
   // properly shut down. By explicitly calling Cleanup/Shutdown we ensure the
   // databases are properly closed.
@@ skipping 1016 matching lines @@
 #endif
   }
   return prerender_manager_.get();
 }
 
 SpellCheckProfile* ProfileImpl::GetSpellCheckProfile() {
   if (!spellcheck_profile_.get())
     spellcheck_profile_.reset(new SpellCheckProfile());
   return spellcheck_profile_.get();
 }