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

extensions/shell/browser/shell_browser_main_parts.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 "extensions/shell/browser/shell_browser_main_parts.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
@@ skipping 137 matching lines @@
       shell_prefs::CreateUserPrefService(browser_context_.get());
 
 #if defined(OS_CHROMEOS)
   chromeos::CrasAudioHandler::Initialize(
       new chromeos::AudioDevicesPrefHandlerImpl(local_state_.get()));
   audio_controller_.reset(new ShellAudioController());
 #endif
 
 #if defined(USE_AURA)
   aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
+  aura::Env::GetInstance()->set_context_factory_private(
+      content::GetContextFactoryPrivate());
 #endif
 
   storage_monitor::StorageMonitor::Create();
 
   desktop_controller_.reset(browser_main_delegate_->CreateDesktopController());
 
   // TODO(jamescook): Initialize user_manager::UserManager.
 
   device_client_.reset(new ShellDeviceClient);
 
@@ skipping 120 matching lines @@
 }
 
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace extensions