| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
| 12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "chrome/browser/importer/external_process_importer_host.h" | 14 #include "chrome/browser/importer/external_process_importer_host.h" |
| 15 #include "chrome/browser/importer/importer_progress_observer.h" | 15 #include "chrome/browser/importer/importer_progress_observer.h" |
| 16 #include "chrome/browser/importer/importer_unittest_utils.h" | 16 #include "chrome/browser/importer/importer_unittest_utils.h" |
| 17 #include "chrome/browser/search_engines/template_url.h" | 17 #include "chrome/browser/search_engines/template_url.h" |
| 18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 288 } | 288 } |
| 289 | 289 |
| 290 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, | 290 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest, |
| 291 MAYBE_IMPORTER(Firefox35Importer)) { | 291 MAYBE_IMPORTER(Firefox35Importer)) { |
| 292 bool import_search_engines = false; | 292 bool import_search_engines = false; |
| 293 scoped_refptr<Firefox3Observer> observer( | 293 scoped_refptr<Firefox3Observer> observer( |
| 294 new Firefox3Observer(import_search_engines)); | 294 new Firefox3Observer(import_search_engines)); |
| 295 Firefox3xImporterBrowserTest("firefox35_profile", observer.get(), | 295 Firefox3xImporterBrowserTest("firefox35_profile", observer.get(), |
| 296 observer.get(), import_search_engines); | 296 observer.get(), import_search_engines); |
| 297 } | 297 } |
| OLD | NEW |