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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <map> 5 #include <map>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
11 #include "apps/app_window_registry.h" 11 #include "apps/app_window_registry.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/system/chromeos/session/logout_confirmation_controller.h" 13 #include "ash/system/chromeos/session/logout_confirmation_controller.h"
14 #include "ash/system/chromeos/session/logout_confirmation_dialog.h" 14 #include "ash/system/chromeos/session/logout_confirmation_dialog.h"
15 #include "base/basictypes.h" 15 #include "base/basictypes.h"
16 #include "base/bind.h" 16 #include "base/bind.h"
17 #include "base/bind_helpers.h" 17 #include "base/bind_helpers.h"
18 #include "base/callback.h" 18 #include "base/callback.h"
19 #include "base/command_line.h" 19 #include "base/command_line.h"
20 #include "base/file_util.h"
21 #include "base/files/file_path.h" 20 #include "base/files/file_path.h"
21 #include "base/files/file_util.h"
22 #include "base/json/json_reader.h" 22 #include "base/json/json_reader.h"
23 #include "base/json/json_writer.h" 23 #include "base/json/json_writer.h"
24 #include "base/location.h" 24 #include "base/location.h"
25 #include "base/macros.h" 25 #include "base/macros.h"
26 #include "base/memory/ref_counted.h" 26 #include "base/memory/ref_counted.h"
27 #include "base/memory/scoped_ptr.h" 27 #include "base/memory/scoped_ptr.h"
28 #include "base/message_loop/message_loop.h" 28 #include "base/message_loop/message_loop.h"
29 #include "base/message_loop/message_loop_proxy.h" 29 #include "base/message_loop/message_loop_proxy.h"
30 #include "base/path_service.h" 30 #include "base/path_service.h"
31 #include "base/prefs/pref_change_registrar.h" 31 #include "base/prefs/pref_change_registrar.h"
(...skipping 2033 matching lines...) Expand 10 before | Expand all | Expand 10 after
2065 ASSERT_TRUE(content::ExecuteScript(contents_, 2065 ASSERT_TRUE(content::ExecuteScript(contents_,
2066 "$('tos-accept-button').click();")); 2066 "$('tos-accept-button').click();"));
2067 2067
2068 WaitForSessionStart(); 2068 WaitForSessionStart();
2069 } 2069 }
2070 2070
2071 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2071 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2072 TermsOfServiceDownloadTest, testing::Bool()); 2072 TermsOfServiceDownloadTest, testing::Bool());
2073 2073
2074 } // namespace policy 2074 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698