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

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

Issue 2510803003: Pass RapporService to content/browser/ (Closed)
Patch Set: Fix more compile errors in JNI files Created 4 years 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/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "base/time/default_clock.h" 8 #include "base/time/default_clock.h"
9 #include "base/time/default_tick_clock.h" 9 #include "base/time/default_tick_clock.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 104
105 metrics_services_manager::MetricsServicesManager* 105 metrics_services_manager::MetricsServicesManager*
106 TestingBrowserProcess::GetMetricsServicesManager() { 106 TestingBrowserProcess::GetMetricsServicesManager() {
107 return nullptr; 107 return nullptr;
108 } 108 }
109 109
110 metrics::MetricsService* TestingBrowserProcess::metrics_service() { 110 metrics::MetricsService* TestingBrowserProcess::metrics_service() {
111 return nullptr; 111 return nullptr;
112 } 112 }
113 113
114 rappor::RapporService* TestingBrowserProcess::rappor_service() { 114 rappor::RapporServiceImpl* TestingBrowserProcess::rappor_service() {
115 return rappor_service_; 115 return rappor_service_;
116 } 116 }
117 117
118 IOThread* TestingBrowserProcess::io_thread() { 118 IOThread* TestingBrowserProcess::io_thread() {
119 return io_thread_; 119 return io_thread_;
120 } 120 }
121 121
122 WatchDogThread* TestingBrowserProcess::watchdog_thread() { 122 WatchDogThread* TestingBrowserProcess::watchdog_thread() {
123 return nullptr; 123 return nullptr;
124 } 124 }
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 void TestingBrowserProcess::SetSafeBrowsingService( 438 void TestingBrowserProcess::SetSafeBrowsingService(
439 safe_browsing::SafeBrowsingService* sb_service) { 439 safe_browsing::SafeBrowsingService* sb_service) {
440 sb_service_ = sb_service; 440 sb_service_ = sb_service;
441 } 441 }
442 442
443 void TestingBrowserProcess::SetRulesetService( 443 void TestingBrowserProcess::SetRulesetService(
444 std::unique_ptr<subresource_filter::RulesetService> ruleset_service) { 444 std::unique_ptr<subresource_filter::RulesetService> ruleset_service) {
445 subresource_filter_ruleset_service_.swap(ruleset_service); 445 subresource_filter_ruleset_service_.swap(ruleset_service);
446 } 446 }
447 447
448 void TestingBrowserProcess::SetRapporService( 448 void TestingBrowserProcess::SetRapporServiceImpl(
449 rappor::RapporService* rappor_service) { 449 rappor::RapporServiceImpl* rappor_service) {
450 rappor_service_ = rappor_service; 450 rappor_service_ = rappor_service;
451 } 451 }
452 452
453 void TestingBrowserProcess::SetShuttingDown(bool is_shutting_down) { 453 void TestingBrowserProcess::SetShuttingDown(bool is_shutting_down) {
454 is_shutting_down_ = is_shutting_down; 454 is_shutting_down_ = is_shutting_down;
455 } 455 }
456 456
457 /////////////////////////////////////////////////////////////////////////////// 457 ///////////////////////////////////////////////////////////////////////////////
458 458
459 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() { 459 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() {
460 TestingBrowserProcess::CreateInstance(); 460 TestingBrowserProcess::CreateInstance();
461 } 461 }
462 462
463 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() { 463 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() {
464 TestingBrowserProcess::DeleteInstance(); 464 TestingBrowserProcess::DeleteInstance();
465 } 465 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698