| 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 "chrome/browser/service_process/service_process_control.h" | 5 #include "chrome/browser/service_process/service_process_control.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" | 
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" | 
| 10 #include "base/location.h" | 10 #include "base/location.h" | 
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" | 
| 12 #include "base/process/kill.h" | 12 #include "base/process/kill.h" | 
| 13 #include "base/process/process.h" | 13 #include "base/process/process.h" | 
| 14 #include "base/process/process_iterator.h" | 14 #include "base/process/process_iterator.h" | 
| 15 #include "base/single_thread_task_runner.h" | 15 #include "base/single_thread_task_runner.h" | 
| 16 #include "base/test/test_timeouts.h" | 16 #include "base/test/test_timeouts.h" | 
| 17 #include "base/thread_task_runner_handle.h" | 17 #include "base/thread_task_runner_handle.h" | 
|  | 18 #include "build/build_config.h" | 
| 18 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" | 
| 19 #include "chrome/common/chrome_constants.h" | 20 #include "chrome/common/chrome_constants.h" | 
| 20 #include "chrome/common/service_process_util.h" | 21 #include "chrome/common/service_process_util.h" | 
| 21 #include "chrome/test/base/in_process_browser_test.h" | 22 #include "chrome/test/base/in_process_browser_test.h" | 
| 22 #include "components/version_info/version_info.h" | 23 #include "components/version_info/version_info.h" | 
| 23 #include "content/public/common/content_paths.h" | 24 #include "content/public/common/content_paths.h" | 
| 24 #include "content/public/common/content_switches.h" | 25 #include "content/public/common/content_switches.h" | 
| 25 #include "content/public/test/test_utils.h" | 26 #include "content/public/test/test_utils.h" | 
| 26 #include "testing/gmock/include/gmock/gmock.h" | 27 #include "testing/gmock/include/gmock/gmock.h" | 
| 27 | 28 | 
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 334   // Callback should not be called during GetHistograms call. | 335   // Callback should not be called during GetHistograms call. | 
| 335   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0); | 336   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0); | 
| 336   // Wait for real callback by providing large timeout value. | 337   // Wait for real callback by providing large timeout value. | 
| 337   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetHistograms( | 338   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetHistograms( | 
| 338       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback, | 339       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback, | 
| 339                 base::Unretained(this)), | 340                 base::Unretained(this)), | 
| 340       base::TimeDelta::FromHours(1))); | 341       base::TimeDelta::FromHours(1))); | 
| 341   EXPECT_CALL(*this, MockHistogramsCallback()).Times(1); | 342   EXPECT_CALL(*this, MockHistogramsCallback()).Times(1); | 
| 342   content::RunMessageLoop(); | 343   content::RunMessageLoop(); | 
| 343 } | 344 } | 
| OLD | NEW | 
|---|