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

Side by Side Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 1549233002: Convert Pass()→std::move() in //chrome/browser/extensions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 12 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 (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 "chrome/browser/extensions/extension_service.h"
6
5 #include <stddef.h> 7 #include <stddef.h>
6 #include <stdint.h> 8 #include <stdint.h>
7
8 #include <algorithm> 9 #include <algorithm>
9 #include <map> 10 #include <map>
10 #include <set> 11 #include <set>
11 #include <string> 12 #include <string>
13 #include <utility>
12 #include <vector> 14 #include <vector>
13 15
14 #include "base/at_exit.h" 16 #include "base/at_exit.h"
15 #include "base/bind.h" 17 #include "base/bind.h"
16 #include "base/command_line.h" 18 #include "base/command_line.h"
17 #include "base/files/file_enumerator.h" 19 #include "base/files/file_enumerator.h"
18 #include "base/files/file_util.h" 20 #include "base/files/file_util.h"
19 #include "base/files/scoped_temp_dir.h" 21 #include "base/files/scoped_temp_dir.h"
20 #include "base/json/json_file_value_serializer.h" 22 #include "base/json/json_file_value_serializer.h"
21 #include "base/json/json_reader.h" 23 #include "base/json/json_reader.h"
(...skipping 18 matching lines...) Expand all
40 #include "chrome/browser/chrome_notification_types.h" 42 #include "chrome/browser/chrome_notification_types.h"
41 #include "chrome/browser/extensions/blacklist.h" 43 #include "chrome/browser/extensions/blacklist.h"
42 #include "chrome/browser/extensions/chrome_app_sorting.h" 44 #include "chrome/browser/extensions/chrome_app_sorting.h"
43 #include "chrome/browser/extensions/component_loader.h" 45 #include "chrome/browser/extensions/component_loader.h"
44 #include "chrome/browser/extensions/crx_installer.h" 46 #include "chrome/browser/extensions/crx_installer.h"
45 #include "chrome/browser/extensions/default_apps.h" 47 #include "chrome/browser/extensions/default_apps.h"
46 #include "chrome/browser/extensions/extension_creator.h" 48 #include "chrome/browser/extensions/extension_creator.h"
47 #include "chrome/browser/extensions/extension_error_reporter.h" 49 #include "chrome/browser/extensions/extension_error_reporter.h"
48 #include "chrome/browser/extensions/extension_error_ui.h" 50 #include "chrome/browser/extensions/extension_error_ui.h"
49 #include "chrome/browser/extensions/extension_management_test_util.h" 51 #include "chrome/browser/extensions/extension_management_test_util.h"
50 #include "chrome/browser/extensions/extension_service.h"
51 #include "chrome/browser/extensions/extension_service_test_base.h" 52 #include "chrome/browser/extensions/extension_service_test_base.h"
52 #include "chrome/browser/extensions/extension_service_test_with_install.h" 53 #include "chrome/browser/extensions/extension_service_test_with_install.h"
53 #include "chrome/browser/extensions/extension_special_storage_policy.h" 54 #include "chrome/browser/extensions/extension_special_storage_policy.h"
54 #include "chrome/browser/extensions/extension_util.h" 55 #include "chrome/browser/extensions/extension_util.h"
55 #include "chrome/browser/extensions/external_install_error.h" 56 #include "chrome/browser/extensions/external_install_error.h"
56 #include "chrome/browser/extensions/external_install_manager.h" 57 #include "chrome/browser/extensions/external_install_manager.h"
57 #include "chrome/browser/extensions/external_policy_loader.h" 58 #include "chrome/browser/extensions/external_policy_loader.h"
58 #include "chrome/browser/extensions/external_pref_loader.h" 59 #include "chrome/browser/extensions/external_pref_loader.h"
59 #include "chrome/browser/extensions/external_provider_impl.h" 60 #include "chrome/browser/extensions/external_provider_impl.h"
60 #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h" 61 #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h"
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 319
319 // We also parse the file into a dictionary to compare what we get back 320 // We also parse the file into a dictionary to compare what we get back
320 // from the provider. 321 // from the provider.
321 JSONStringValueDeserializer deserializer(json_data); 322 JSONStringValueDeserializer deserializer(json_data);
322 scoped_ptr<base::Value> json_value = deserializer.Deserialize(NULL, NULL); 323 scoped_ptr<base::Value> json_value = deserializer.Deserialize(NULL, NULL);
323 324
324 if (!json_value || !json_value->IsType(base::Value::TYPE_DICTIONARY)) { 325 if (!json_value || !json_value->IsType(base::Value::TYPE_DICTIONARY)) {
325 NOTREACHED() << "Unable to deserialize json data"; 326 NOTREACHED() << "Unable to deserialize json data";
326 return -1; 327 return -1;
327 } else { 328 } else {
328 prefs_ = base::DictionaryValue::From(json_value.Pass()); 329 prefs_ = base::DictionaryValue::From(std::move(json_value));
329 } 330 }
330 331
331 // Reset our counter. 332 // Reset our counter.
332 ids_found_ = 0; 333 ids_found_ = 0;
333 // Ask the provider to look up all extensions and return them. 334 // Ask the provider to look up all extensions and return them.
334 provider_->VisitRegisteredExtension(); 335 provider_->VisitRegisteredExtension();
335 336
336 return ids_found_; 337 return ids_found_;
337 } 338 }
338 339
(...skipping 5834 matching lines...) Expand 10 before | Expand all | Expand 10 after
6173 6174
6174 service()->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED, 6175 service()->Observe(chrome::NOTIFICATION_PROFILE_DESTRUCTION_STARTED,
6175 content::Source<Profile>(profile()), 6176 content::Source<Profile>(profile()),
6176 content::NotificationService::NoDetails()); 6177 content::NotificationService::NoDetails());
6177 EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_); 6178 EXPECT_EQ(UnloadedExtensionInfo::REASON_PROFILE_SHUTDOWN, unloaded_reason_);
6178 EXPECT_EQ(0u, registry()->enabled_extensions().size()); 6179 EXPECT_EQ(0u, registry()->enabled_extensions().size());
6179 EXPECT_EQ(0u, registry()->disabled_extensions().size()); 6180 EXPECT_EQ(0u, registry()->disabled_extensions().size());
6180 EXPECT_EQ(0u, registry()->terminated_extensions().size()); 6181 EXPECT_EQ(0u, registry()->terminated_extensions().size());
6181 EXPECT_EQ(0u, registry()->blacklisted_extensions().size()); 6182 EXPECT_EQ(0u, registry()->blacklisted_extensions().size());
6182 } 6183 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service_test_base.cc ('k') | chrome/browser/extensions/extension_storage_monitor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698