Removed Profile::GetHostContentSettingsMap

chrome/browser/push_messaging/push_messaging_service_impl.cc

 // Copyright 2014 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/push_messaging/push_messaging_service_impl.h"
 
 #include <vector>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
@@ skipping 727 matching lines @@
 
 void PushMessagingServiceImpl::SetContentSettingChangedCallbackForTesting(
       const base::Closure& callback) {
   content_setting_changed_callback_for_testing_ = callback;
 }
 
 // KeyedService methods -------------------------------------------------------
 
 void PushMessagingServiceImpl::Shutdown() {
   GetGCMDriver()->RemoveAppHandler(kPushMessagingAppIdentifierPrefix);
-  profile_->GetHostContentSettingsMap()->RemoveObserver(this);
+  HostContentSettingsMapFactory::GetForProfile(profile_)->RemoveObserver(this);

[Peter Beverloo, 2015/09/09 21:03:51]

Shouldn't the PushMessagingServiceFactory declare a dependency on the
HostContentSettingsMapFactory after this change? (Which also goes for many of
the other uses...)

[Bernhard Bauer, 2015/09/10 09:30:44]

Yes, that would be good.

[PEConn, 2015/09/11 12:57:26]

PushMessagingServiceFactory already declares a dependency (it was in the earlier
changelist). However I went through and found some other Factories that needed
dependencies declared.

 #if defined(ENABLE_BACKGROUND)
   // TODO(mvanouwerkerk): Ensure Push API unregisters correctly from Background
   // Mode - crbug.com/527036.
   if (UseBackgroundMode() && g_browser_process->background_mode_manager()) {
     g_browser_process->background_mode_manager()->UnregisterTrigger(profile_,
                                                                     this);
   }
 #endif  // defined(ENABLE_BACKGROUND)
 }
 
@@ skipping 28 matching lines @@
       switches::kEnablePushMessagePayload);
 }
 
 gcm::GCMDriver* PushMessagingServiceImpl::GetGCMDriver() const {
   gcm::GCMProfileService* gcm_profile_service =
       gcm::GCMProfileServiceFactory::GetForProfile(profile_);
   CHECK(gcm_profile_service);
   CHECK(gcm_profile_service->driver());
   return gcm_profile_service->driver();
 }