Send the ICC profile to the compositor under aura.

ui/compositor/compositor.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 "ui/compositor/compositor.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <deque>
@@ skipping 249 matching lines @@
   DCHECK(it->second);
   context_factory_->GetSurfaceManager()->UnregisterSurfaceNamespaceHierarchy(
       it->second, it->first);
   surface_clients_.erase(it);
 }
 
 void Compositor::SetOutputSurface(
     std::unique_ptr<cc::OutputSurface> output_surface) {
   output_surface_requested_ = false;
   host_->SetOutputSurface(std::move(output_surface));
-  // Visibility is reset when the output surface is lost, so update it to match
-  // the Compositor's.
+  // Display properties are reset when the output surface is lost, so update it
+  // to match the Compositor's.
   context_factory_->SetDisplayVisible(this, host_->IsVisible());
+  context_factory_->SetDisplayColorSpace(this, color_space_);
 }
 
 void Compositor::ScheduleDraw() {
   host_->SetNeedsCommit();
 }
 
 void Compositor::SetRootLayer(Layer* root_layer) {
   if (root_layer_ == root_layer)
     return;
   if (root_layer_)
@@ skipping 49 matching lines @@
   }
   if (device_scale_factor_ != scale) {
     device_scale_factor_ = scale;
     host_->GetLayerTree()->SetDeviceScaleFactor(scale);
     if (root_layer_)
       root_layer_->OnDeviceScaleFactorChanged(scale);
   }
 }
 
 void Compositor::SetDisplayColorSpace(const gfx::ColorSpace& color_space) {
-  context_factory_->SetDisplayColorSpace(this, color_space);
+  color_space_ = color_space;
+  // Color space is reset when the output surface is lost, so this must also be
+  // updated then.
+  context_factory_->SetDisplayColorSpace(this, color_space_);
 }
 
 void Compositor::SetBackgroundColor(SkColor color) {
   host_->GetLayerTree()->set_background_color(color);
   ScheduleDraw();
 }
 
 void Compositor::SetVisible(bool visible) {
   host_->SetVisible(visible);
   // Visibility is reset when the output surface is lost, so this must also be
@@ skipping 194 matching lines @@
                     observer_list_,
                     OnCompositingLockStateChanged(this));
 }
 
 void Compositor::CancelCompositorLock() {
   if (compositor_lock_)
     compositor_lock_->CancelLock();
 }
 
 }  // namespace ui