Porting refactoring changes:...

chrome/browser/importer/importer_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <urlhist.h>
 #include <shlguid.h>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/ie7_password.h"
 #include "chrome/browser/importer/ie_importer.h"
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/env_util.h"
 #include "chrome/common/win_util.h"
 
 class ImporterTest : public testing::Test {
  public:
  protected:
   virtual void SetUp() {
     // Creates a new profile in a new subdirectory in the temp directory.
     ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_path_));
     file_util::AppendToPath(&test_path_, L"ImporterTest");
     file_util::Delete(test_path_, true);
@@ skipping 234 matching lines @@
 
   for (int i = 0; i < arraysize(items); ++i) {
     HRESULT res = pstore->WriteItem(0, type, subtype, items[i].name,
         items[i].data_size, reinterpret_cast<BYTE*>(items[i].data),
         NULL, 0, 0);
     ASSERT_TRUE(res == PST_E_OK);
   }
 }
 
 TEST_F(ImporterTest, IEImporter) {
-  // Skips in Win2000 for the running environment can not be set up.
-  if (env_util::GetOperatingSystemVersion() == "5.0")
-    return;
-
   // Sets up a favorites folder.
   win_util::ScopedCOMInitializer com_init;
   std::wstring path = test_path_;
   file_util::AppendToPath(&path, L"Favorites");
   CreateDirectory(path.c_str(), NULL);
   CreateDirectory((path + L"\\SubFolder").c_str(), NULL);
   CreateDirectory((path + L"\\Links").c_str(), NULL);
   CreateDirectory((path + L"\\Links\\SubFolderOfLinks").c_str(), NULL);
   CreateDirectory((path + L"\\\x0061").c_str(), NULL);
   ASSERT_TRUE(CreateUrlFile(path + L"\\Google Home Page.url",
@@ skipping 525 matching lines @@
   profile_info.source_path = profile_path_;
   scoped_refptr<ImporterHost> host = new ImporterHost(loop);
   Firefox3Observer* observer = new Firefox3Observer();
   host->SetObserver(observer);
   loop->PostTask(FROM_HERE, NewRunnableMethod(host.get(),
       &ImporterHost::StartImportSettings, profile_info,
       HISTORY | PASSWORDS | FAVORITES | SEARCH_ENGINES, observer, true));
   loop->Run();
 }