Mac: remove some now-dead code and add a comment.

chrome/browser/importer/safari_importer_unittest.mm

 // Copyright (c) 2009 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 "chrome/browser/importer/safari_importer.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 89 matching lines @@
     EXPECT_EQ(entry.in_toolbar, kImportedBookmarksData[i].in_toolbar);
     EXPECT_EQ(entry.url, kImportedBookmarksData[i].url);
     if (kImportedBookmarksData[i].path_is_empty) {
       EXPECT_EQ(entry.path.size(), 0U);
     } else {
       EXPECT_EQ(entry.path.size(), 1U);
       EXPECT_EQ(entry.path[0], kImportedBookmarksData[i].path);
       EXPECT_EQ(entry.title, kImportedBookmarksData[i].title);
     }
   }
-
 }
 
 TEST_F(SafariImporterTest, FavIconImport) {
   scoped_refptr<SafariImporter> importer(GetSafariImporter());
   sqlite_utils::scoped_sqlite_db_ptr db(importer->OpenFavIconDB());
   ASSERT_TRUE(db.get() != NULL);
 
   SafariImporter::FaviconMap favicon_map;
   importer->ImportFavIconURLs(db.get(), &favicon_map);
 
@@ skipping 20 matching lines @@
       != fav1.urls.end());
 
   EXPECT_TRUE(fav1.urls.find(
       GURL("http://www.opensearch.org/Special:Search?search=lalala&go=Search"))
           != fav1.urls.end());
 }
 
 TEST_F(SafariImporterTest, CanImport) {
   uint16 items = NONE;
   EXPECT_TRUE(SafariImporter::CanImport(GetTestSafariLibraryPath(), &items));
-  // We can't check the exact value of items because the HOME_PAGE bit depends
-  // on the defaults of the current machine.
-  EXPECT_EQ(items & HISTORY, HISTORY);
-  EXPECT_EQ(items & FAVORITES, FAVORITES);
+  EXPECT_EQ(items, HISTORY | FAVORITES);
   EXPECT_EQ(items & COOKIES, NONE);
   EXPECT_EQ(items & PASSWORDS, NONE);
   EXPECT_EQ(items & SEARCH_ENGINES, NONE);
+  EXPECT_EQ(items & HOME_PAGE, NONE);
 
   // Check that we don't import anything from a bogus library directory.
   FilePath fake_library_dir;
   file_util::CreateNewTempDirectory("FakeSafariLibrary", &fake_library_dir);
   FileAutoDeleter deleter(fake_library_dir);
-
-  // Despite the fact that we're pointing to an empty library directory,
-  // CanImport may still return true on systems where the Safari defaults
-  // are defined. This means that we can't make assumptions about the return
-  // value here.
-  SafariImporter::CanImport(fake_library_dir, &items);
-  EXPECT_EQ(items & ~HOME_PAGE, NONE); // See comment above about HOME_PAGE.
-
-
+  EXPECT_FALSE(SafariImporter::CanImport(fake_library_dir, &items));
 }