| 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/test/base/chrome_test_suite.h" | 5 #include "chrome/test/base/chrome_test_suite.h" |
| 6 | 6 |
| 7 #if defined(OS_CHROMEOS) | 7 #if defined(OS_CHROMEOS) |
| 8 #include <stdio.h> | 8 #include <stdio.h> |
| 9 #include <unistd.h> | 9 #include <unistd.h> |
| 10 #endif | 10 #endif |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 scoped_ptr<chrome::ChromeContentBrowserClient> browser_content_client_; | 166 scoped_ptr<chrome::ChromeContentBrowserClient> browser_content_client_; |
| 167 | 167 |
| 168 scoped_refptr<LocalHostResolverProc> host_resolver_proc_; | 168 scoped_refptr<LocalHostResolverProc> host_resolver_proc_; |
| 169 scoped_ptr<net::ScopedDefaultHostResolverProc> scoped_host_resolver_proc_; | 169 scoped_ptr<net::ScopedDefaultHostResolverProc> scoped_host_resolver_proc_; |
| 170 | 170 |
| 171 DISALLOW_COPY_AND_ASSIGN(ChromeTestSuiteInitializer); | 171 DISALLOW_COPY_AND_ASSIGN(ChromeTestSuiteInitializer); |
| 172 }; | 172 }; |
| 173 | 173 |
| 174 } // namespace | 174 } // namespace |
| 175 | 175 |
| 176 const char ChromeTestSuite::kLaunchAsBrowser[] = "as-browser"; | |
| 177 | |
| 178 ChromeTestSuite::ChromeTestSuite(int argc, char** argv) | 176 ChromeTestSuite::ChromeTestSuite(int argc, char** argv) |
| 179 : content::ContentTestSuiteBase(argc, argv) { | 177 : content::ContentTestSuiteBase(argc, argv) { |
| 180 } | 178 } |
| 181 | 179 |
| 182 ChromeTestSuite::~ChromeTestSuite() { | 180 ChromeTestSuite::~ChromeTestSuite() { |
| 183 } | 181 } |
| 184 | 182 |
| 185 void ChromeTestSuite::Initialize() { | 183 void ChromeTestSuite::Initialize() { |
| 186 #if defined(OS_MACOSX) | 184 #if defined(OS_MACOSX) |
| 187 base::mac::ScopedNSAutoreleasePool autorelease_pool; | 185 base::mac::ScopedNSAutoreleasePool autorelease_pool; |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 #if defined(OS_MACOSX) | 246 #if defined(OS_MACOSX) |
| 249 base::mac::SetOverrideFrameworkBundle(NULL); | 247 base::mac::SetOverrideFrameworkBundle(NULL); |
| 250 #endif | 248 #endif |
| 251 | 249 |
| 252 base::StatsTable::set_current(NULL); | 250 base::StatsTable::set_current(NULL); |
| 253 stats_table_.reset(); | 251 stats_table_.reset(); |
| 254 RemoveSharedMemoryFile(stats_filename_); | 252 RemoveSharedMemoryFile(stats_filename_); |
| 255 | 253 |
| 256 base::TestSuite::Shutdown(); | 254 base::TestSuite::Shutdown(); |
| 257 } | 255 } |
| OLD | NEW |