ash static initializers: Remove the final two static initializers.

ash::DisplayController was still depending on Display::kInvalidDisplayID
in a way that emitted static initializers. Just initialize it to -1;
DisplayController::DisplayController() still sets the value during its
constructor.

Remove one more instance of <iostream>. I was confused by the output
because there were actually two different files called debug_utils.cc in
the ash build which weren't in the normal linux build which both were
including <iostream>.

BUG=300084
R=sky@chromium.org

Review URL: https://codereview.chromium.org/272133003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270472 0039d316-1c4b-4281-b951-d872f2087c98

ash/display/display_controller.cc

@@ -61,7 +61,8 @@ namespace {
 // accessed after Shell is deleted. A separate display instance is created
 // during the shutdown instead of always keeping two display instances
 // (one here and another one in display_manager) in sync, which is error prone.
-int64 primary_display_id = gfx::Display::kInvalidDisplayID;
+// This is initialized in the constructor, and then in CreatePrimaryHost().
+int64 primary_display_id = -1;
 
 // Specifies how long the display change should have been disabled
 // after each display change operations.

ui/compositor/debug_utils.cc

@@ -8,7 +8,7 @@
 
 #include <cmath>
 #include <iomanip>
-#include <iostream>
+#include <ostream>
 #include <string>
 
 #include "base/logging.h"