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

Side by Side Diff: chrome/browser/component_updater/ev_whitelist_component_installer.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 "chrome/browser/component_updater/ev_whitelist_component_installer.h" 5 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/file_util.h"
12 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/file_util.h"
13 #include "base/lazy_instance.h" 13 #include "base/lazy_instance.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "components/component_updater/component_updater_paths.h" 16 #include "components/component_updater/component_updater_paths.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 #include "net/ssl/ssl_config_service.h" 18 #include "net/ssl/ssl_config_service.h"
19 19
20 using component_updater::ComponentUpdateService; 20 using component_updater::ComponentUpdateService;
21 21
22 namespace { 22 namespace {
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 118
119 scoped_ptr<ComponentInstallerTraits> traits( 119 scoped_ptr<ComponentInstallerTraits> traits(
120 new EVWhitelistComponentInstallerTraits()); 120 new EVWhitelistComponentInstallerTraits());
121 // |cus| will take ownership of |installer| during installer->Register(cus). 121 // |cus| will take ownership of |installer| during installer->Register(cus).
122 DefaultComponentInstaller* installer = 122 DefaultComponentInstaller* installer =
123 new DefaultComponentInstaller(traits.Pass()); 123 new DefaultComponentInstaller(traits.Pass());
124 installer->Register(cus); 124 installer->Register(cus);
125 } 125 }
126 126
127 } // namespace component_updater 127 } // namespace component_updater
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698