Revert 48186, 48196, 48198

chrome/browser/importer/importer_unittest.cc

 // Copyright (c) 2010 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>
@@ skipping 104 matching lines @@
   ChromeThread file_thread_;
   FilePath test_path_;
   FilePath profile_path_;
   FilePath app_path_;
 };
 
 const int kMaxPathSize = 5;
 
 typedef struct {
   const bool in_toolbar;
-  const size_t path_size;
+  const int path_size;
   const wchar_t* path[kMaxPathSize];
   const wchar_t* title;
   const char* url;
 } BookmarkList;
 
 typedef struct {
   const char* origin;
   const char* action;
   const char* realm;
   const wchar_t* username_element;
@@ skipping 41 matching lines @@
 
 // Returns true if the |entry| is in the |list|.
 bool FindBookmarkEntry(const ProfileWriter::BookmarkEntry& entry,
                        const BookmarkList* list, int list_size) {
   for (int i = 0; i < list_size; ++i)
     if (list[i].in_toolbar == entry.in_toolbar &&
         list[i].path_size == entry.path.size() &&
         list[i].url == entry.url.spec() &&
         list[i].title == entry.title) {
       bool equal = true;
-      for (size_t k = 0; k < list[i].path_size; ++k)
+      for (int k = 0; k < list[i].path_size; ++k)
         if (list[i].path[k] != entry.path[k]) {
           equal = false;
           break;
         }
 
       if (equal)
         return true;
     }
   return false;
 }
@@ skipping 665 matching lines @@
                         true);
 }
 
 TEST_F(ImporterTest, Firefox35Importer) {
   bool import_search_engines = false;
   scoped_refptr<Firefox3Observer> observer =
       new Firefox3Observer(import_search_engines);
   Firefox3xImporterTest("firefox35_profile", observer.get(), observer.get(),
                         import_search_engines);
 }