ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate

ash/shell/content/client/shell_browser_main_parts.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/content/client/shell_browser_main_parts.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/content/shell_content_state.h"
@@ skipping 117 matching lines @@
 
   bluez::BluezDBusManager::Initialize(nullptr, true /* use stub */);
 #endif
 
   ShellContentState::SetInstance(
       new ShellContentStateImpl(browser_context_.get()));
   ui::MaterialDesignController::Initialize();
   ash::ShellInitParams init_params;
   init_params.delegate = delegate_;
   init_params.context_factory = content::GetContextFactory();
+  init_params.context_factory_private = content::GetContextFactoryPrivate();
   init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
   ash::Shell::CreateInstance(init_params);
   ash::WmShell::Get()->CreateShelf();
   ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
 
   window_watcher_.reset(new ash::shell::WindowWatcher);
   display::Screen::GetScreen()->AddObserver(window_watcher_.get());
 
   ash::shell::InitWindowTypeLauncher();
 
@@ skipping 24 matching lines @@
   browser_context_.reset();
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
   base::RunLoop().Run();
   return true;
 }
 
 }  // namespace shell
 }  // namespace ash