Add IsInternal property to gfx::Display

ash/display/display_manager_unittest.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 "ash/display/display_manager.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 372 matching lines @@
   // suspend...
   displays.clear();
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
 
   // and resume with different external display.
   displays.push_back(native_display);
   displays.push_back(gfx::Display(11, gfx::Rect(1, 1, 100, 100)));
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
+
+  display_manager()->ResetInternalDisplayForTest();
 }
 
 #if defined(OS_WIN)
 // This test currently fails on Win8/Metro as it picks up the actual
 // display size. http://crbug.com/154081
 #define MAYBE_TestNativeDisplaysChangedNoInternal \
         DISABLED_TestNativeDisplaysChangedNoInternal
 #else
 #define MAYBE_TestNativeDisplaysChangedNoInternal \
         TestNativeDisplaysChangedNoInternal
@@ skipping 112 matching lines @@
   EXPECT_EQ("-500,0 500x500",
             FindDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("0,0 100x100", FindDisplayForId(10).bounds().ToString());
 
   // OnNativeDisplaysChanged may change the display bounds.  Here makes sure
   // nothing changed if the exactly same displays are specified.
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ("-500,0 500x500",
             FindDisplayForId(internal_display_id).bounds().ToString());
   EXPECT_EQ("0,0 100x100", FindDisplayForId(10).bounds().ToString());
+
+  display_manager()->ResetInternalDisplayForTest();
 }
 
 TEST_F(DisplayManagerTest, AutomaticOverscanInsets) {
   UpdateDisplay("200x200,400x400");
 
   std::vector<gfx::Display> displays;
   displays.push_back(*display_manager()->GetDisplayAt(0));
   displays.push_back(*display_manager()->GetDisplayAt(1));
   int64 id = displays[1].id();
   display_manager()->SetHasOverscanFlagForTest(id, true);
@@ skipping 12 matching lines @@
   // Do not overscan even though it has 'has_overscan' flag, if the custom
   // insets is empty.
   display_manager()->SetOverscanInsets(id, gfx::Insets());
   display_manager()->OnNativeDisplaysChanged(displays);
   EXPECT_EQ("1,201 400x400",
             display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
 }
 
 }  // namespace internal
 }  // namespace ash