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

Side by Side Diff: chrome/test/in_process_browser_test.cc

Issue 3153029: Resubmit r56600 - Start/stop service process when browser starts and stop (Closed)
Patch Set: Created 10 years, 4 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
« no previous file with comments | « chrome/service/service_process.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/in_process_browser_test.h" 5 #include "chrome/test/in_process_browser_test.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 extern int BrowserMain(const MainFunctionParams&); 65 extern int BrowserMain(const MainFunctionParams&);
66 66
67 const wchar_t kUnitTestShowWindows[] = L"show-windows"; 67 const wchar_t kUnitTestShowWindows[] = L"show-windows";
68 68
69 // Passed as value of kTestType. 69 // Passed as value of kTestType.
70 static const char kBrowserTestType[] = "browser"; 70 static const char kBrowserTestType[] = "browser";
71 71
72 // Default delay for the time-out at which we stop the 72 // Default delay for the time-out at which we stop the
73 // inner-message loop the first time. 73 // inner-message loop the first time.
74 const int kInitialTimeoutInMS = 30000; 74 const int kInitialTimeoutInMS = 30000000;
75 75
76 // Delay for sub-sequent time-outs once the initial time-out happened. 76 // Delay for sub-sequent time-outs once the initial time-out happened.
77 const int kSubsequentTimeoutInMS = 5000; 77 const int kSubsequentTimeoutInMS = 5000;
78 78
79 InProcessBrowserTest::InProcessBrowserTest() 79 InProcessBrowserTest::InProcessBrowserTest()
80 : browser_(NULL), 80 : browser_(NULL),
81 test_server_(net::TestServer::TYPE_HTTP, 81 test_server_(net::TestServer::TYPE_HTTP,
82 FilePath(FILE_PATH_LITERAL("chrome/test/data"))), 82 FilePath(FILE_PATH_LITERAL("chrome/test/data"))),
83 show_window_(false), 83 show_window_(false),
84 dom_automation_enabled_(false), 84 dom_automation_enabled_(false),
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 329
330 GTEST_NONFATAL_FAILURE_(error_message.c_str()); 330 GTEST_NONFATAL_FAILURE_(error_message.c_str());
331 331
332 MessageLoopForUI::current()->Quit(); 332 MessageLoopForUI::current()->Quit();
333 } 333 }
334 334
335 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) { 335 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
336 DCHECK_GT(timeout_value, 0); 336 DCHECK_GT(timeout_value, 0);
337 initial_timeout_ = timeout_value; 337 initial_timeout_ = timeout_value;
338 } 338 }
OLDNEW
« no previous file with comments | « chrome/service/service_process.cc ('k') | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698