| OLD | NEW |
| 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 "base/base_switches.h" | 5 #include "base/base_switches.h" |
| 6 #include "base/debug/debugger.h" | 6 #include "base/debug/debugger.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/metrics/statistics_recorder.h" | 8 #include "base/metrics/statistics_recorder.h" |
| 9 #include "base/run_loop.h" |
| 9 #include "chrome/common/service_process_util.h" | 10 #include "chrome/common/service_process_util.h" |
| 10 #include "chrome/service/service_process.h" | 11 #include "chrome/service/service_process.h" |
| 11 #include "content/public/common/main_function_params.h" | 12 #include "content/public/common/main_function_params.h" |
| 12 #include "net/url_request/url_request.h" | 13 #include "net/url_request/url_request.h" |
| 13 | 14 |
| 14 // Mainline routine for running as the service process. | 15 // Mainline routine for running as the service process. |
| 15 int ServiceProcessMain(const content::MainFunctionParams& parameters) { | 16 int ServiceProcessMain(const content::MainFunctionParams& parameters) { |
| 16 // Chrome disallows cookies by default. All code paths that want to use | 17 // Chrome disallows cookies by default. All code paths that want to use |
| 17 // cookies should go through the browser process. | 18 // cookies should go through the browser process. |
| 18 net::URLRequest::SetDefaultCookiePolicyToBlock(); | 19 net::URLRequest::SetDefaultCookiePolicyToBlock(); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 30 | 31 |
| 31 // If there is already a service process running, quit now. | 32 // If there is already a service process running, quit now. |
| 32 std::unique_ptr<ServiceProcessState> state(new ServiceProcessState); | 33 std::unique_ptr<ServiceProcessState> state(new ServiceProcessState); |
| 33 if (!state->Initialize()) | 34 if (!state->Initialize()) |
| 34 return 0; | 35 return 0; |
| 35 | 36 |
| 36 ServiceProcess service_process; | 37 ServiceProcess service_process; |
| 37 if (service_process.Initialize(&main_message_loop, | 38 if (service_process.Initialize(&main_message_loop, |
| 38 parameters.command_line, | 39 parameters.command_line, |
| 39 state.release())) { | 40 state.release())) { |
| 40 base::MessageLoop::current()->Run(); | 41 base::RunLoop().Run(); |
| 41 } else { | 42 } else { |
| 42 LOG(ERROR) << "Service process failed to initialize"; | 43 LOG(ERROR) << "Service process failed to initialize"; |
| 43 } | 44 } |
| 44 return 0; | 45 return 0; |
| 45 } | 46 } |
| OLD | NEW |