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

Side by Side Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_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 <string> 5 #include <string>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "chrome/browser/chrome_notification_types.h" 15 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chromeos/login/test/oobe_base_test.h" 16 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
17 #include "chrome/browser/chromeos/login/wizard_controller.h" 17 #include "chrome/browser/chromeos/login/wizard_controller.h"
18 #include "chrome/browser/policy/test/local_policy_test_server.h" 18 #include "chrome/browser/policy/test/local_policy_test_server.h"
19 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/browser_list.h" 20 #include "chrome/browser/ui/browser_list.h"
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 ASSERT_TRUE(tabs); 178 ASSERT_TRUE(tabs);
179 const int expected_tab_count = static_cast<int>(arraysize(kStartupURLs)); 179 const int expected_tab_count = static_cast<int>(arraysize(kStartupURLs));
180 EXPECT_EQ(expected_tab_count, tabs->count()); 180 EXPECT_EQ(expected_tab_count, tabs->count());
181 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) { 181 for (int i = 0; i < expected_tab_count && i < tabs->count(); ++i) {
182 EXPECT_EQ(GURL(kStartupURLs[i]), 182 EXPECT_EQ(GURL(kStartupURLs[i]),
183 tabs->GetWebContentsAt(i)->GetVisibleURL()); 183 tabs->GetWebContentsAt(i)->GetVisibleURL());
184 } 184 }
185 } 185 }
186 186
187 } // namespace policy 187 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698