android WCG support: Add missing plumbing

ui/android/display_android_manager.cc

 // Copyright 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/android/display_android_manager.h"
 
 #include <jni.h>
 #include <map>
 
 #include "base/android/jni_android.h"
 #include "base/stl_util.h"
 #include "jni/DisplayAndroidManager_jni.h"
 #include "ui/android/screen_android.h"
 #include "ui/android/window_android.h"
 #include "ui/display/display.h"
+#include "ui/gfx/icc_profile.h"
 
 namespace ui {
 
 using base::android::AttachCurrentThread;
 using display::Display;
 using display::DisplayList;
 
 void SetScreenAndroid() {
   // Do not override existing Screen.
   DCHECK_EQ(display::Screen::GetScreen(), nullptr);
@@ skipping 58 matching lines @@
     jint rotationDegrees,
     jint bitsPerPixel,
     jint bitsPerComponent) {
   gfx::Rect bounds_in_pixels = gfx::Rect(width, height);
   const gfx::Rect bounds_in_dip = gfx::Rect(
       gfx::ScaleToCeiledSize(bounds_in_pixels.size(), 1.0f / dipScale));
 
   display::Display display(sdkDisplayId, bounds_in_dip);
   if (!Display::HasForceDeviceScaleFactor())
     display.set_device_scale_factor(dipScale);
+  // TODO(ccameron): Know the ideal color profile to use here.
+  // https://crbug.com/735658
+  if (!gfx::ICCProfile::HasForcedProfile())
+    display.set_color_space(gfx::ColorSpace::CreateSRGB());
 
   display.set_size_in_pixels(bounds_in_pixels.size());
   display.SetRotationAsDegree(rotationDegrees);
   display.set_color_depth(bitsPerPixel);
   display.set_depth_per_component(bitsPerComponent);
   display.set_is_monochrome(bitsPerComponent == 0);
 
   ProcessDisplayChanged(display, sdkDisplayId == primary_display_id_);
 }
 
 void DisplayAndroidManager::RemoveDisplay(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jobject,
     jint sdkDisplayId) {
   display_list().RemoveDisplay(sdkDisplayId);
 }
 
 void DisplayAndroidManager::SetPrimaryDisplayId(
     JNIEnv* env,
     const base::android::JavaParamRef<jobject>& jobject,
     jint sdkDisplayId) {
   primary_display_id_ = sdkDisplayId;
 }
 
 }  // namespace ui