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

Side by Side Diff: chrome/browser/profile_resetter/profile_resetter_unittest.cc

Issue 2888073002: Remove raw DictionaryValue::Set in //chrome (Closed)
Patch Set: Fix Tests Created 3 years, 7 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/profile_resetter/profile_resetter.h" 5 #include "chrome/browser/profile_resetter/profile_resetter.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 const base::FilePath& path, 380 const base::FilePath& path,
381 Manifest::Location location, 381 Manifest::Location location,
382 extensions::Manifest::Type type, 382 extensions::Manifest::Type type,
383 bool installed_by_default) { 383 bool installed_by_default) {
384 base::DictionaryValue manifest; 384 base::DictionaryValue manifest;
385 manifest.SetString(extensions::manifest_keys::kVersion, "1.0.0.0"); 385 manifest.SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
386 manifest.SetString(extensions::manifest_keys::kName, name); 386 manifest.SetString(extensions::manifest_keys::kName, name);
387 switch (type) { 387 switch (type) {
388 case extensions::Manifest::TYPE_THEME: 388 case extensions::Manifest::TYPE_THEME:
389 manifest.Set(extensions::manifest_keys::kTheme, 389 manifest.Set(extensions::manifest_keys::kTheme,
390 new base::DictionaryValue); 390 base::MakeUnique<base::DictionaryValue>());
391 break; 391 break;
392 case extensions::Manifest::TYPE_HOSTED_APP: 392 case extensions::Manifest::TYPE_HOSTED_APP:
393 manifest.SetString(extensions::manifest_keys::kLaunchWebURL, 393 manifest.SetString(extensions::manifest_keys::kLaunchWebURL,
394 "http://www.google.com"); 394 "http://www.google.com");
395 manifest.SetString(extensions::manifest_keys::kUpdateURL, 395 manifest.SetString(extensions::manifest_keys::kUpdateURL,
396 "http://clients2.google.com/service/update2/crx"); 396 "http://clients2.google.com/service/update2/crx");
397 break; 397 break;
398 case extensions::Manifest::TYPE_EXTENSION: 398 case extensions::Manifest::TYPE_EXTENSION:
399 // do nothing 399 // do nothing
400 break; 400 break;
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 new ResettableSettingsSnapshot(profile())); 1052 new ResettableSettingsSnapshot(profile()));
1053 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail, 1053 deleted_snapshot->RequestShortcuts(base::Bind(&FeedbackCapture::Fail,
1054 base::Unretained(&capture))); 1054 base::Unretained(&capture)));
1055 deleted_snapshot.reset(); 1055 deleted_snapshot.reset();
1056 // Running remaining tasks shouldn't trigger the callback to be called as 1056 // Running remaining tasks shouldn't trigger the callback to be called as
1057 // |deleted_snapshot| was deleted before it could run. 1057 // |deleted_snapshot| was deleted before it could run.
1058 base::RunLoop().RunUntilIdle(); 1058 base::RunLoop().RunUntilIdle();
1059 } 1059 }
1060 1060
1061 } // namespace 1061 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698