| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 <atlbase.h> | 7 #include <atlbase.h> |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <unknwn.h> | 9 #include <unknwn.h> |
| 10 #include <intshcut.h> | 10 #include <intshcut.h> |
| (...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 591 | 591 |
| 592 private: | 592 private: |
| 593 int bookmark_count_; | 593 int bookmark_count_; |
| 594 int history_count_; | 594 int history_count_; |
| 595 int password_count_; | 595 int password_count_; |
| 596 int keyword_count_; | 596 int keyword_count_; |
| 597 std::wstring default_keyword_; | 597 std::wstring default_keyword_; |
| 598 std::wstring default_keyword_url_; | 598 std::wstring default_keyword_url_; |
| 599 }; | 599 }; |
| 600 | 600 |
| 601 TEST_F(ImporterTest, Firefox2Importer) { | 601 // http://crbug.com/11142 |
| 602 TEST_F(ImporterTest, DISABLED_Firefox2Importer) { |
| 602 std::wstring data_path; | 603 std::wstring data_path; |
| 603 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path)); | 604 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path)); |
| 604 file_util::AppendToPath(&data_path, L"firefox2_profile\\*"); | 605 file_util::AppendToPath(&data_path, L"firefox2_profile\\*"); |
| 605 ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, true)); | 606 ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, true)); |
| 606 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path)); | 607 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path)); |
| 607 file_util::AppendToPath(&data_path, L"firefox2_nss"); | 608 file_util::AppendToPath(&data_path, L"firefox2_nss"); |
| 608 ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, false)); | 609 ASSERT_TRUE(file_util::CopyDirectory(data_path, profile_path_, false)); |
| 609 | 610 |
| 610 std::wstring search_engine_path = app_path_; | 611 std::wstring search_engine_path = app_path_; |
| 611 file_util::AppendToPath(&search_engine_path, L"searchplugins"); | 612 file_util::AppendToPath(&search_engine_path, L"searchplugins"); |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 827 profile_info.app_path = app_path_; | 828 profile_info.app_path = app_path_; |
| 828 profile_info.source_path = profile_path_; | 829 profile_info.source_path = profile_path_; |
| 829 scoped_refptr<ImporterHost> host = new ImporterHost(loop); | 830 scoped_refptr<ImporterHost> host = new ImporterHost(loop); |
| 830 Firefox3Observer* observer = new Firefox3Observer(); | 831 Firefox3Observer* observer = new Firefox3Observer(); |
| 831 host->SetObserver(observer); | 832 host->SetObserver(observer); |
| 832 loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(), | 833 loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(), |
| 833 &ImporterHost::StartImportSettings, profile_info, | 834 &ImporterHost::StartImportSettings, profile_info, |
| 834 HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true)); | 835 HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true)); |
| 835 loop->Run(); | 836 loop->Run(); |
| 836 } | 837 } |
| OLD | NEW |