Remove disabled parts of ImporterTest

BUG=2466

Review URL: http://codereview.chromium.org/8056015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103128 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 37 deletions

diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index 3772ce7..f79e708 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -206,12 +206,6 @@ class TestObserver : public ProfileWriter,
     MessageLoop::current()->Quit();
     EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_);
     EXPECT_EQ(1, history_count_);
-#if 0  // This part of the test is disabled. See bug #2466
-    if (base::win::GetVersion() >= base::win::VERSION_VISTA)
-      EXPECT_EQ(0, password_count_);
-    else
-      EXPECT_EQ(1, password_count_);
-#endif
   }
 
   virtual bool BookmarkModelIsLoaded() const {
@@ -357,30 +351,7 @@ TEST_F(ImporterTest, IEImporter) {
   file_util::WriteFile(path + L"\\InvalidUrlFile.url", "x", 1);
   file_util::WriteFile(path + L"\\PlainTextFile.txt", "x", 1);
 
-  // Sets up dummy password data.
   HRESULT res;
-#if 0  // This part of the test is disabled. See bug #2466
-  base::win::ScopedComPtr<IPStore> pstore;
-  HMODULE pstorec_dll;
-  GUID type = IEImporter::kUnittestGUID;
-  GUID subtype = IEImporter::kUnittestGUID;
-  // PStore is read-only in Windows Vista.
-  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
-    typedef HRESULT (WINAPI *PStoreCreateFunc)(IPStore**, DWORD, DWORD, DWORD);
-    pstorec_dll = LoadLibrary(L"pstorec.dll");
-    PStoreCreateFunc PStoreCreateInstance =
-        (PStoreCreateFunc)GetProcAddress(pstorec_dll, "PStoreCreateInstance");
-    res = PStoreCreateInstance(pstore.Receive(), 0, 0, 0);
-    ASSERT_TRUE(res == S_OK);
-    ClearPStoreType(pstore, &type, &subtype);
-    PST_TYPEINFO type_info;
-    type_info.szDisplayName = L"TestType";
-    type_info.cbSize = 8;
-    pstore->CreateType(0, &type, &type_info, 0);
-    pstore->CreateSubtype(0, &type, &subtype, &type_info, NULL, 0);
-    WritePStore(pstore, &type, &subtype);
-  }
-#endif
 
   // Sets up a special history link.
   base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
@@ -412,14 +383,6 @@ TEST_F(ImporterTest, IEImporter) {
   // Cleans up.
   url_history_stg2->DeleteUrl(kIEIdentifyUrl, 0);
   url_history_stg2.Release();
-#if 0  // This part of the test is disabled. See bug #2466
-  if (base::win::GetVersion() < base::win::VERSION_VISTA) {
-    ClearPStoreType(pstore, &type, &subtype);
-    // Releases it befor unload the dll.
-    pstore.Release();
-    FreeLibrary(pstorec_dll);
-  }
-#endif
 }
 
 TEST_F(ImporterTest, IE7Importer) {