OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 // The order of these includes is important. | 8 // The order of these includes is important. |
9 #include <windows.h> | 9 #include <windows.h> |
10 #include <unknwn.h> | 10 #include <unknwn.h> |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 | 198 |
199 // importer::ImporterProgressObserver: | 199 // importer::ImporterProgressObserver: |
200 virtual void ImportStarted() OVERRIDE {} | 200 virtual void ImportStarted() OVERRIDE {} |
201 virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE {} | 201 virtual void ImportItemStarted(importer::ImportItem item) OVERRIDE {} |
202 virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE {} | 202 virtual void ImportItemEnded(importer::ImportItem item) OVERRIDE {} |
203 virtual void ImportEnded() OVERRIDE { | 203 virtual void ImportEnded() OVERRIDE { |
204 MessageLoop::current()->Quit(); | 204 MessageLoop::current()->Quit(); |
205 EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_); | 205 EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_); |
206 EXPECT_EQ(1, history_count_); | 206 EXPECT_EQ(1, history_count_); |
207 #if 0 // This part of the test is disabled. See bug #2466 | 207 #if 0 // This part of the test is disabled. See bug #2466 |
208 if (base::win::GetVersion() < base::win::VERSION_VISTA) | 208 if (base::win::GetVersion() >= base::win::VERSION_VISTA) |
209 EXPECT_EQ(0, password_count_); | 209 EXPECT_EQ(0, password_count_); |
210 else | 210 else |
211 EXPECT_EQ(1, password_count_); | 211 EXPECT_EQ(1, password_count_); |
212 #endif | 212 #endif |
213 } | 213 } |
214 | 214 |
215 virtual bool BookmarkModelIsLoaded() const { | 215 virtual bool BookmarkModelIsLoaded() const { |
216 // Profile is ready for writing. | 216 // Profile is ready for writing. |
217 return true; | 217 return true; |
218 } | 218 } |
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
881 true); | 881 true); |
882 } | 882 } |
883 | 883 |
884 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) { | 884 TEST_F(ImporterTest, MAYBE(Firefox35Importer)) { |
885 bool import_search_engines = false; | 885 bool import_search_engines = false; |
886 scoped_refptr<Firefox3Observer> observer( | 886 scoped_refptr<Firefox3Observer> observer( |
887 new Firefox3Observer(import_search_engines)); | 887 new Firefox3Observer(import_search_engines)); |
888 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(), | 888 Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(), |
889 import_search_engines); | 889 import_search_engines); |
890 } | 890 } |
OLD | NEW |