Merge to M-56 (branch 2924) Use the correct profile for shelf prefs.

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

 // Copyright 2013 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/ash/launcher/chrome_launcher_controller.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
-#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
 #include "content/public/common/service_manager_connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 // static
@@ skipping 49 matching lines @@
   }
 
   return nullptr;
 }
 
 void ChromeLauncherController::SetShelfAutoHideBehaviorFromPrefs() {
   if (!ConnectToShelfController())
     return;
 
   // The pref helper functions return default values for invalid display ids.
-  PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
+  PrefService* prefs = profile_->GetPrefs();
   for (const auto& display : display::Screen::GetScreen()->GetAllDisplays()) {
     shelf_controller_->SetAutoHideBehavior(
         ash::launcher::GetShelfAutoHideBehaviorPref(prefs, display.id()),
         display.id());
   }
 }
 
 void ChromeLauncherController::SetShelfAlignmentFromPrefs() {
   if (!ConnectToShelfController())
     return;
 
   // The pref helper functions return default values for invalid display ids.
-  PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
+  PrefService* prefs = profile_->GetPrefs();
   for (const auto& display : display::Screen::GetScreen()->GetAllDisplays()) {
     shelf_controller_->SetAlignment(
         ash::launcher::GetShelfAlignmentPref(prefs, display.id()),
         display.id());
   }
 }
 
 void ChromeLauncherController::SetShelfBehaviorsFromPrefs() {
   SetShelfAutoHideBehaviorFromPrefs();
   SetShelfAlignmentFromPrefs();
@@ skipping 75 matching lines @@
   // TODO(msw): Avoid handling this pref change and forwarding the value to ash.
   ash::launcher::SetShelfAutoHideBehaviorPref(profile_->GetPrefs(), display_id,
                                               auto_hide);
 }
 
 void ChromeLauncherController::OnAppImageUpdated(const std::string& app_id,
                                                  const gfx::ImageSkia& image) {
   // Implemented by subclasses; this should not be called.
   NOTREACHED();
 }