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

Side by Side Diff: chrome/browser/component_updater/test/supervised_user_whitelist_installer_unittest.cc

Issue 808773005: Move most of the component updater artifacts to update_client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
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/bind.h" 5 #include "base/bind.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/json/json_file_value_serializer.h" 10 #include "base/json/json_file_value_serializer.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/sequenced_task_runner.h" 14 #include "base/sequenced_task_runner.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/test/scoped_path_override.h" 16 #include "base/test/scoped_path_override.h"
17 #include "base/values.h" 17 #include "base/values.h"
18 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 18 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
19 #include "components/component_updater/component_updater_paths.h" 19 #include "components/component_updater/component_updater_paths.h"
20 #include "components/component_updater/component_updater_service.h" 20 #include "components/component_updater/component_updater_service.h"
21 #include "components/component_updater/component_updater_utils.h"
22 #include "components/crx_file/id_util.h" 21 #include "components/crx_file/id_util.h"
22 #include "components/update_client/crx_update_item.h"
23 #include "components/update_client/update_client.h"
24 #include "components/update_client/utils.h"
23 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
24 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
25 27
28 using update_client::CrxComponent;
29 using update_client::CrxUpdateItem;
30
26 namespace component_updater { 31 namespace component_updater {
27 32
28 namespace { 33 namespace {
29 34
30 const char kCrxId[] = "abcdefghijklmnopponmlkjihgfedcba"; 35 const char kCrxId[] = "abcdefghijklmnopponmlkjihgfedcba";
31 const char kName[] = "Some Whitelist"; 36 const char kName[] = "Some Whitelist";
32 const char kVersion[] = "1.2.3.4"; 37 const char kVersion[] = "1.2.3.4";
33 const char kWhitelistContents[] = "{\"foo\": \"bar\"}"; 38 const char kWhitelistContents[] = "{\"foo\": \"bar\"}";
34 const char kWhitelistFile[] = "whitelist.json"; 39 const char kWhitelistFile[] = "whitelist.json";
35 40
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 250
246 base::RunLoop run_loop; 251 base::RunLoop run_loop;
247 bool new_installation = false; 252 bool new_installation = false;
248 LoadWhitelist(new_installation, run_loop.QuitClosure()); 253 LoadWhitelist(new_installation, run_loop.QuitClosure());
249 run_loop.Run(); 254 run_loop.Run();
250 255
251 ASSERT_NO_FATAL_FAILURE(CheckRegisteredComponent(kVersion)); 256 ASSERT_NO_FATAL_FAILURE(CheckRegisteredComponent(kVersion));
252 } 257 }
253 258
254 } // namespace component_updater 259 } // namespace component_updater
OLDNEW
« no previous file with comments | « chrome/browser/component_updater/test/component_updater_service_unittest.cc ('k') | chrome/browser/net/crl_set_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698