| 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 <windows.h> | 7 #include <windows.h> |
| 8 #include <unknwn.h> | 8 #include <unknwn.h> |
| 9 #include <intshcut.h> | 9 #include <intshcut.h> |
| 10 #include <pstore.h> | 10 #include <pstore.h> |
| (...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 830 private: | 830 private: |
| 831 int bookmark_count_; | 831 int bookmark_count_; |
| 832 int history_count_; | 832 int history_count_; |
| 833 int password_count_; | 833 int password_count_; |
| 834 int keyword_count_; | 834 int keyword_count_; |
| 835 bool import_search_engines_; | 835 bool import_search_engines_; |
| 836 std::wstring default_keyword_; | 836 std::wstring default_keyword_; |
| 837 std::wstring default_keyword_url_; | 837 std::wstring default_keyword_url_; |
| 838 }; | 838 }; |
| 839 | 839 |
| 840 TEST_F(ImporterTest, Firefox30Importer) { | 840 // This test is disabled |
| 841 TEST_F(ImporterTest, DISABLED_Firefox30Importer) { |
| 841 Firefox3Observer* observer = new Firefox3Observer(); | 842 Firefox3Observer* observer = new Firefox3Observer(); |
| 842 Firefox3xImporterTest(L"firefox3_profile", observer, observer, true); | 843 Firefox3xImporterTest(L"firefox3_profile", observer, observer, true); |
| 843 } | 844 } |
| 844 | 845 |
| 845 TEST_F(ImporterTest, Firefox35Importer) { | 846 TEST_F(ImporterTest, Firefox35Importer) { |
| 846 bool import_search_engines = false; | 847 bool import_search_engines = false; |
| 847 Firefox3Observer* observer = new Firefox3Observer(import_search_engines); | 848 Firefox3Observer* observer = new Firefox3Observer(import_search_engines); |
| 848 Firefox3xImporterTest(L"firefox35_profile", observer, observer, | 849 Firefox3xImporterTest(L"firefox35_profile", observer, observer, |
| 849 import_search_engines); | 850 import_search_engines); |
| 850 } | 851 } |
| OLD | NEW |