Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / display / display_preferences_unittest.cc

diff --git a/src/chrome/browser/chromeos/display/display_preferences_unittest.cc b/src/chrome/browser/chromeos/display/display_preferences_unittest.cc
index 4c63885..60e2686 100644 (file)
--- a/src/chrome/browser/chromeos/display/display_preferences_unittest.cc
+++ b/src/chrome/browser/chromeos/display/display_preferences_unittest.cc
@@ -26,7 +26,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "ui/display/chromeos/display_configurator.h"
-#include "ui/gfx/vector3d_f.h"
+#include "ui/gfx/geometry/vector3d_f.h"
 #include "ui/message_center/message_center.h"
 
 using ash::ResolutionNotificationController;
@@ -50,7 +50,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase {
 
   virtual ~DisplayPreferencesTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
         .WillRepeatedly(testing::Return(false));
     EXPECT_CALL(*mock_user_manager_, Shutdown());
@@ -60,7 +60,7 @@ class DisplayPreferencesTest : public ash::test::AshTestBase {
     observer_.reset(new DisplayConfigurationObserver());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     observer_.reset();
     TestingBrowserProcess::GetGlobal()->SetLocalState(NULL);
     ash::test::AshTestBase::TearDown();