Reland "Load and apply a vcgt table from an ICC file to the internal display"

ash/shell.cc

Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index e572d8de68d9d4104d7566cb741a5a1a647f8751..a6f455b15dc98a78d4fb392777c73e012fb568de 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -121,6 +121,7 @@
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/ash_constants.h"
+#include "ash/content/display/display_color_manager_chromeos.h"
 #include "ash/content/display/screen_orientation_controller_chromeos.h"
 #include "ash/display/display_change_observer_chromeos.h"
 #include "ash/display/display_configurator_animation.h"
@@ -811,6 +812,7 @@ Shell::~Shell() {
   keyboard::KeyboardController::ResetInstance(NULL);
 
 #if defined(OS_CHROMEOS)
+  display_color_manager_.reset();
   if (display_change_observer_)
     display_configurator_->RemoveObserver(display_change_observer_.get());
   if (display_configurator_animation_)
@@ -863,6 +865,8 @@ void Shell::Init(const ShellInitParams& init_params) {
         delegate_->IsFirstRunAfterBoot() ? kChromeOsBootColor : 0);
     display_initialized = true;
   }
+  display_color_manager_.reset(
+      new DisplayColorManager(display_configurator_.get()));
 #endif  // defined(OS_CHROMEOS)
   if (!display_initialized)
     display_manager_->InitDefaultDisplay();