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

Side by Side Diff: chrome/test/base/testing_browser_process.cc

Issue 2898063002: Hold cros_component_installers in browser_process. (Closed)
Patch Set: update commit message. 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/test/base/testing_browser_process.h" 5 #include "chrome/test/base/testing_browser_process.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/time/default_clock.h" 9 #include "base/time/default_clock.h"
10 #include "base/time/default_tick_clock.h" 10 #include "base/time/default_tick_clock.h"
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 342
343 CRLSetFetcher* TestingBrowserProcess::crl_set_fetcher() { 343 CRLSetFetcher* TestingBrowserProcess::crl_set_fetcher() {
344 return nullptr; 344 return nullptr;
345 } 345 }
346 346
347 component_updater::PnaclComponentInstaller* 347 component_updater::PnaclComponentInstaller*
348 TestingBrowserProcess::pnacl_component_installer() { 348 TestingBrowserProcess::pnacl_component_installer() {
349 return nullptr; 349 return nullptr;
350 } 350 }
351 351
352 #if defined(OS_CHROMEOS)
353 component_updater::DefaultComponentInstaller*
354 TestingBrowserProcess::cros_component_installer(
355 const std::string& name,
356 std::unique_ptr<component_updater::ComponentInstallerTraits>
357 installer_traits) {
358 static std::map<std::string,
359 scoped_refptr<component_updater::DefaultComponentInstaller>>
360 cros_component_installers_;
361 auto it = cros_component_installers_.find(name);
362 if (it == cros_component_installers_.end()) {
363 cros_component_installers_[name] =
364 new component_updater::DefaultComponentInstaller(
365 std::move(installer_traits));
366 }
367 return cros_component_installers_[name].get();
368 }
369 #endif
370
352 component_updater::SupervisedUserWhitelistInstaller* 371 component_updater::SupervisedUserWhitelistInstaller*
353 TestingBrowserProcess::supervised_user_whitelist_installer() { 372 TestingBrowserProcess::supervised_user_whitelist_installer() {
354 return nullptr; 373 return nullptr;
355 } 374 }
356 375
357 MediaFileSystemRegistry* TestingBrowserProcess::media_file_system_registry() { 376 MediaFileSystemRegistry* TestingBrowserProcess::media_file_system_registry() {
358 #if defined(OS_ANDROID) 377 #if defined(OS_ANDROID)
359 NOTIMPLEMENTED(); 378 NOTIMPLEMENTED();
360 return nullptr; 379 return nullptr;
361 #else 380 #else
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
481 500
482 /////////////////////////////////////////////////////////////////////////////// 501 ///////////////////////////////////////////////////////////////////////////////
483 502
484 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() { 503 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() {
485 TestingBrowserProcess::CreateInstance(); 504 TestingBrowserProcess::CreateInstance();
486 } 505 }
487 506
488 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() { 507 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() {
489 TestingBrowserProcess::DeleteInstance(); 508 TestingBrowserProcess::DeleteInstance();
490 } 509 }
OLDNEW
« chrome/browser/browser_process.h ('K') | « chrome/test/base/testing_browser_process.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698