OLD | NEW |
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 "testing/gtest/include/gtest/gtest.h" | 5 #include "testing/gtest/include/gtest/gtest.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
10 #include <windows.h> | 10 #include <windows.h> |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "base/path_service.h" | 22 #include "base/path_service.h" |
23 #include "base/stl_util-inl.h" | 23 #include "base/stl_util-inl.h" |
24 #include "base/string_util.h" | 24 #include "base/string_util.h" |
25 #include "base/utf_string_conversions.h" | 25 #include "base/utf_string_conversions.h" |
26 #include "base/values.h" | 26 #include "base/values.h" |
27 #include "chrome/browser/browser_thread.h" | 27 #include "chrome/browser/browser_thread.h" |
28 #include "chrome/browser/history/history_types.h" | 28 #include "chrome/browser/history/history_types.h" |
29 #include "chrome/browser/importer/importer.h" | 29 #include "chrome/browser/importer/importer.h" |
30 #include "chrome/browser/importer/importer_bridge.h" | 30 #include "chrome/browser/importer/importer_bridge.h" |
31 #include "chrome/browser/importer/importer_data_types.h" | 31 #include "chrome/browser/importer/importer_data_types.h" |
32 #include "chrome/browser/profiles/profile.h" | |
33 #include "chrome/browser/search_engines/template_url.h" | 32 #include "chrome/browser/search_engines/template_url.h" |
34 #include "chrome/common/chrome_paths.h" | 33 #include "chrome/common/chrome_paths.h" |
35 #include "webkit/glue/password_form.h" | 34 #include "webkit/glue/password_form.h" |
36 | 35 |
37 #if defined(OS_WIN) | 36 #if defined(OS_WIN) |
| 37 #include "app/win_util.h" |
38 #include "base/scoped_comptr_win.h" | 38 #include "base/scoped_comptr_win.h" |
39 #include "app/win_util.h" | |
40 #include "chrome/browser/importer/ie_importer.h" | 39 #include "chrome/browser/importer/ie_importer.h" |
41 #include "chrome/browser/password_manager/ie7_password.h" | 40 #include "chrome/browser/password_manager/ie7_password.h" |
42 #endif | 41 #endif |
43 | 42 |
44 using importer::FAVORITES; | 43 using importer::FAVORITES; |
45 using importer::FIREFOX2; | 44 using importer::FIREFOX2; |
46 using importer::FIREFOX3; | 45 using importer::FIREFOX3; |
47 using importer::HISTORY; | 46 using importer::HISTORY; |
48 using importer::ImportItem; | 47 using importer::ImportItem; |
49 #if defined(OS_WIN) | 48 #if defined(OS_WIN) |
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
889 true); | 888 true); |
890 } | 889 } |
891 | 890 |
892 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) { | 891 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) { |
893 bool import_search_engines = false; | 892 bool import_search_engines = false; |
894 scoped_refptr<Firefox3Observer> observer( | 893 scoped_refptr<Firefox3Observer> observer( |
895 new Firefox3Observer(import_search_engines)); | 894 new Firefox3Observer(import_search_engines)); |
896 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(), | 895 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(), |
897 import_search_engines); | 896 import_search_engines); |
898 } | 897 } |
OLD | NEW |