Regsiter Ash prefs in mash

ash/shell.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
@@ skipping 787 matching lines @@
 
 void Shell::Init(const ShellInitParams& init_params) {
   const Config config = shell_port_->GetAshConfig();
 
   blocking_pool_ = init_params.blocking_pool;
 
   wallpaper_delegate_ = shell_delegate_->CreateWallpaperDelegate();
 
   // Can be null in tests.
   if (config == Config::MASH && shell_delegate_->GetShellConnector()) {
+    scoped_refptr<PrefRegistrySimple> pref_registry =
+        make_scoped_refptr(new PrefRegistrySimple());

[Sam McNally, 2017/05/15 22:31:09]

I think base::MakeShared might be the new preferred pattern:
auto pref_registry = base::MakeShared<PrefRegistrySimple>();

[afakhry, 2017/05/16 00:26:58]

Done.

+    Shell::RegisterPrefs(pref_registry.get());
     prefs::ConnectToPrefService(
-        shell_delegate_->GetShellConnector(),
-        make_scoped_refptr(new PrefRegistrySimple()),
+        shell_delegate_->GetShellConnector(), pref_registry,

[Sam McNally, 2017/05/15 22:31:09]

std::move(pref_registry)

[afakhry, 2017/05/16 00:26:58]

Done.

         std::vector<PrefValueStore::PrefStoreType>(),
         base::Bind(&Shell::OnPrefServiceInitialized, base::Unretained(this)),
         prefs::mojom::kForwarderServiceName);
   }
 
   // Some delegates access ShellPort during their construction. Create them here
   // instead of the ShellPort constructor.
   accessibility_delegate_.reset(shell_delegate_->CreateAccessibilityDelegate());
   palette_delegate_ = shell_delegate_->CreatePaletteDelegate();
   toast_manager_ = base::MakeUnique<ToastManager>();
@@ skipping 442 matching lines @@
 void Shell::OnPrefServiceInitialized(
     std::unique_ptr<::PrefService> pref_service) {
   if (!instance_)
     return;
   // |pref_service_| is null if can't connect to Chrome (as happens when
   // running mash outside of chrome --mash and chrome isn't built).
   pref_service_ = std::move(pref_service);
 }
 
 }  // namespace ash