Remove a bunch of GetProfileSyncService callers to use the new factory.

chrome/browser/ui/webui/ntp/foreign_session_handler.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/ui/webui/ntp/foreign_session_handler.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sync/profile_sync_service.h"
+#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_ui.h"
 
 namespace browser_sync {
 
 // Maximum number of session we're going to display on the NTP
 static const int kMaxSessionsToShow = 10;
@@ skipping 38 matching lines @@
       // Calling foreignSessions with empty list will automatically hide
       // foreign session section.
       web_ui()->CallJavascriptFunction("foreignSessions", list_value);
       break;
     default:
       NOTREACHED();
   }
 }
 
 SessionModelAssociator* ForeignSessionHandler::GetModelAssociator() {
-  ProfileSyncService* service =
-      Profile::FromWebUI(web_ui())->GetProfileSyncService();
+  ProfileSyncService* service(ProfileSyncServiceFactory::

[Andrew T Wilson (Slow), 2012/01/26 23:09:09]

nit: also fine, although this combines my two pet style peeves: initializing
pointers with () instead of =, and wrapping after a namespace/style name. Both
perfectly acceptable, of course, I just like whining.

+      GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
   if (service == NULL)
     return NULL;
 
   // We only want to set the model associator if there is one, and it is done
   // syncing sessions.
   SessionModelAssociator* model_associator =
       service->GetSessionModelAssociator();
   if (model_associator == NULL ||
       !service->ShouldPushChanges()) {
     return NULL;
@@ skipping 147 matching lines @@
     return false;
   dictionary->SetString("type", "window");
   dictionary->SetDouble("timestamp",
       static_cast<double>(window.timestamp.ToInternalValue()));
   dictionary->SetInteger("sessionId", window.window_id.id());
   dictionary->Set("tabs", tab_values.release());
   return true;
 }
 
 }  // namespace browser_sync