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

Side by Side Diff: chrome/test/remoting/fullscreen_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
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | chrome/test/remoting/me2me_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 class FullscreenBrowserTest : public RemoteDesktopBrowserTest { 12 class FullscreenBrowserTest : public RemoteDesktopBrowserTest {
13 protected: 13 protected:
14 bool WaitForFullscreenChange(bool expect_fullscreen); 14 bool WaitForFullscreenChange(bool expect_fullscreen);
15 }; 15 };
16 16
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 content::WebContents* content = app_web_content(); 67 content::WebContents* content = app_web_content();
68 LoadScript(content, FILE_PATH_LITERAL("bump_scroll_browser_test.js")); 68 LoadScript(content, FILE_PATH_LITERAL("bump_scroll_browser_test.js"));
69 69
70 RunJavaScriptTest(content, "Bump_Scroll", "{pin: '" + me2me_pin() + "'}"); 70 RunJavaScriptTest(content, "Bump_Scroll", "{pin: '" + me2me_pin() + "'}");
71 71
72 Cleanup(); 72 Cleanup();
73 } 73 }
74 74
75 } // namespace remoting 75 } // namespace remoting
OLDNEW
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | chrome/test/remoting/me2me_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698