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

Side by Side Diff: chrome/test/remoting/pin_browsertest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_util.h"
6 #include "base/files/file_path.h" 5 #include "base/files/file_path.h"
6 #include "base/files/file_util.h"
7 #include "chrome/test/remoting/remote_desktop_browsertest.h" 7 #include "chrome/test/remoting/remote_desktop_browsertest.h"
8 #include "chrome/test/remoting/waiter.h" 8 #include "chrome/test/remoting/waiter.h"
9 9
10 namespace remoting { 10 namespace remoting {
11 11
12 IN_PROC_BROWSER_TEST_F(RemoteDesktopBrowserTest, MANUAL_Cancel_PIN) { 12 IN_PROC_BROWSER_TEST_F(RemoteDesktopBrowserTest, MANUAL_Cancel_PIN) {
13 SetUpTestForMe2Me(); 13 SetUpTestForMe2Me();
14 14
15 content::WebContents* content = app_web_content(); 15 content::WebContents* content = app_web_content();
16 LoadScript(content, FILE_PATH_LITERAL("cancel_pin_browser_test.js")); 16 LoadScript(content, FILE_PATH_LITERAL("cancel_pin_browser_test.js"));
(...skipping 27 matching lines...) Expand all
44 44
45 RunJavaScriptTest(content, "Update_PIN", "{" 45 RunJavaScriptTest(content, "Update_PIN", "{"
46 "old_pin: '" + me2me_pin() + "'," 46 "old_pin: '" + me2me_pin() + "',"
47 "new_pin: '314159'" 47 "new_pin: '314159'"
48 "}"); 48 "}");
49 49
50 Cleanup(); 50 Cleanup();
51 } 51 }
52 52
53 } // namespace remoting 53 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/test/remoting/me2me_browsertest.cc ('k') | chrome/test/remoting/qunit_browser_test_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698