Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(465)

Unified Diff: ash/wm/window_state_unittest.cc

Issue 1547223002: Convert Pass()→std::move() in //ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_state.cc ('k') | ash/wm/workspace/phantom_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_state_unittest.cc
diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc
index ecfbc6a23e08c352bf8ea5d71b03bc4678d88ae1..4c95ce7476a761d2d79d6cdeca4c2aee313209a5 100644
--- a/ash/wm/window_state_unittest.cc
+++ b/ash/wm/window_state_unittest.cc
@@ -4,6 +4,8 @@
#include "ash/wm/window_state.h"
+#include <utility>
+
#include "ash/screen_util.h"
#include "ash/shell.h"
#include "ash/test/ash_test_base.h"
@@ -306,11 +308,11 @@ TEST_F(WindowStateTest, StateSwapRestore) {
scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0));
WindowState* window_state = GetWindowState(window.get());
EXPECT_FALSE(window_state->IsMaximized());
- scoped_ptr<WindowState::State> old(window_state->SetStateObject(
- scoped_ptr<WindowState::State> (new AlwaysMaximizeTestState(
- window_state->GetStateType()))).Pass());
+ scoped_ptr<WindowState::State> old(
+ window_state->SetStateObject(scoped_ptr<WindowState::State>(
+ new AlwaysMaximizeTestState(window_state->GetStateType()))));
EXPECT_TRUE(window_state->IsMaximized());
- window_state->SetStateObject(old.Pass());
+ window_state->SetStateObject(std::move(old));
EXPECT_FALSE(window_state->IsMaximized());
}
« no previous file with comments | « ash/wm/window_state.cc ('k') | ash/wm/workspace/phantom_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698