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

Side by Side Diff: chrome/browser/component_updater/test/component_updater_service_unittest.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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "chrome/browser/component_updater/test/component_updater_service_unitte st.h" 5 #include "chrome/browser/component_updater/test/component_updater_service_unitte st.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "chrome/browser/component_updater/component_updater_resource_throttle.h " 16 #include "chrome/browser/component_updater/component_updater_resource_throttle.h "
17 #include "chrome/browser/component_updater/test/test_configurator.h" 17 #include "chrome/browser/component_updater/test/test_configurator.h"
18 #include "chrome/browser/component_updater/test/test_installer.h" 18 #include "chrome/browser/component_updater/test/test_installer.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
(...skipping 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after
1496 component_updater()->RemoveObserver(&observer2); 1496 component_updater()->RemoveObserver(&observer2);
1497 1497
1498 test_configurator()->SetLoopCount(1); 1498 test_configurator()->SetLoopCount(1);
1499 component_updater()->Start(); 1499 component_updater()->Start();
1500 RunThreads(); 1500 RunThreads();
1501 1501
1502 component_updater()->Stop(); 1502 component_updater()->Stop();
1503 } 1503 }
1504 1504
1505 } // namespace component_updater 1505 } // namespace component_updater
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698