Fix errors in display resolution change notifications

chrome/browser/chromeos/display/display_preferences_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 "chrome/browser/chromeos/display/display_preferences.h"
 
 #include <stdint.h>
 
 #include <string>
 #include <utility>
@@ skipping 555 matching lines @@
   UpdateDisplay("400x300#500x400|400x300|300x200");
   int64_t id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   // Set display's resolution in single display. It creates the notification and
   // display preferences should not stored meanwhile.
   ash::Shell* shell = ash::Shell::Get();
 
   scoped_refptr<display::ManagedDisplayMode> old_mode(
       new display::ManagedDisplayMode(gfx::Size(400, 300)));
   scoped_refptr<display::ManagedDisplayMode> new_mode(
       new display::ManagedDisplayMode(gfx::Size(500, 400)));
-  if (shell->display_manager()->SetDisplayMode(id, new_mode)) {
-    shell->resolution_notification_controller()->PrepareNotification(
-        id, old_mode, new_mode, base::Closure());
-  }
+  EXPECT_TRUE(shell->resolution_notification_controller()
+                  ->PrepareNotificationAndSetDisplayMode(id, old_mode, new_mode,
+                                                         base::Closure()));
   UpdateDisplay("500x400#500x400|400x300|300x200");
 
   const base::DictionaryValue* properties =
       local_state()->GetDictionary(prefs::kDisplayProperties);
   const base::DictionaryValue* property = nullptr;
   EXPECT_TRUE(properties->GetDictionary(base::Int64ToString(id), &property));
   int width = 0, height = 0;
   EXPECT_FALSE(property->GetInteger("width", &width));
   EXPECT_FALSE(property->GetInteger("height", &height));
 
@@ skipping 560 matching lines @@
 
   EXPECT_EQ(gfx::Rect(0, 0, 200, 200),
             display_manager()->GetDisplayForId(list[0]).bounds());
   EXPECT_EQ(gfx::Rect(-200, 0, 200, 200),
             display_manager()->GetDisplayForId(list[1]).bounds());
   EXPECT_EQ(gfx::Rect(-100, 200, 300, 300),
             display_manager()->GetDisplayForId(list[2]).bounds());
 }
 
 }  // namespace chromeos