Search for history items that was imported from IE is not working.

chrome/browser/importer/ie_importer_browsertest_win.cc

 // Copyright (c) 2013 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.
 
 // The order of these includes is important.
 #include <windows.h>
 #include <unknwn.h>
 #include <intshcut.h>
 #include <propvarutil.h>
 #include <shlguid.h>
@@ skipping 67 matching lines @@
   {false, 0, {}, L"a", "http://www.google.com/0"},
   {false, 1, {"b"}, L"a", "http://www.google.com/1"},
   {false, 1, {"b"}, L"b", "http://www.google.com/2"},
   {false, 0, {}, L"c", "http://www.google.com/3"},
 };
 
 const base::char16 kIEIdentifyUrl[] =
     L"http://A79029D6-753E-4e27-B807-3D46AB1545DF.com:8080/path?key=value";
 const base::char16 kIEIdentifyTitle[] =
     L"Unittest GUID";
+const base::char16 kIECacheItemUrl[] =
+    L"http://B2EF40C8-2569-4D7E-97EA-BAD9DF468D9C.com";
+const base::char16 kIECacheItemTitle[] =
+    L"Unittest Cache Item GUID";
 
 const base::char16 kFaviconStreamSuffix[] = L"url:favicon:$DATA";
 const char kDummyFaviconImageData[] =
     "\x42\x4D"          // Magic signature 'BM'
     "\x1E\x00\x00\x00"  // File size
     "\x00\x00\x00\x00"  // Reserved
     "\x1A\x00\x00\x00"  // Offset of the pixel data
     "\x0C\x00\x00\x00"  // Header Size
     "\x01\x00\x01\x00"  // Size: 1x1
     "\x01\x00"          // Reserved
@@ skipping 136 matching lines @@
   virtual void ImportStarted() override {}
   virtual void ImportItemStarted(importer::ImportItem item) override {}
   virtual void ImportItemEnded(importer::ImportItem item) override {}
   virtual void ImportEnded() override {
     base::MessageLoop::current()->Quit();
     if (importer_items_ & importer::FAVORITES) {
       EXPECT_EQ(arraysize(kIEBookmarks), bookmark_count_);
       EXPECT_EQ(arraysize(kIEFaviconGroup), favicon_count_);
     }
     if (importer_items_ & importer::HISTORY)
-      EXPECT_EQ(1, history_count_);
+      EXPECT_EQ(2, history_count_);
     if (importer_items_ & importer::HOME_PAGE)
       EXPECT_EQ(1, homepage_count_);
     if ((importer_items_ & importer::PASSWORDS) && (ie_version_ == IE7))
       EXPECT_EQ(1, ie7_password_count_);
     // We need to test the IE6 password importer code.
     // https://crbug.com/257100
     // EXPECT_EQ(1, password_count_);
   }
 
   virtual bool BookmarkModelIsLoaded() const {
@@ skipping 12 matching lines @@
     EXPECT_EQ(L"user", form.username_element);
     EXPECT_EQ(L"1", form.username_value);
     EXPECT_EQ(L"", form.password_element);
     EXPECT_EQ(L"2", form.password_value);
     EXPECT_EQ("", form.action.spec());
     ++password_count_;
   }
 
   virtual void AddHistoryPage(const history::URLRows& page,
                               history::VisitSource visit_source) {
+    bool cache_item_found = false;
+    bool history_item_found = false;
     // Importer should read the specified URL.
     for (size_t i = 0; i < page.size(); ++i) {
       if (page[i].title() == kIEIdentifyTitle &&
-          page[i].url() == GURL(kIEIdentifyUrl))
+          page[i].url() == GURL(kIEIdentifyUrl)) {
+        EXPECT_FALSE(page[i].hidden());
+        history_item_found = true;
         ++history_count_;
+      }
+      if (page[i].title() == kIECacheItemTitle &&
+          page[i].url() == GURL(kIECacheItemUrl)) {
+        EXPECT_TRUE(page[i].hidden());
+        cache_item_found = true;
+        ++history_count_;
+      }
     }
+    EXPECT_TRUE(history_item_found);
+    EXPECT_TRUE(cache_item_found);
     EXPECT_EQ(history::SOURCE_IE_IMPORTED, visit_source);
   }
 
   virtual void AddBookmarks(
       const std::vector<ImportedBookmarkEntry>& bookmarks,
       const base::string16& top_level_folder_name) override {
     ASSERT_LE(bookmark_count_ + bookmarks.size(), arraysize(kIEBookmarks));
     // Importer should import the IE Favorites folder the same as the list,
     // in the same order.
     for (size_t i = 0; i < bookmarks.size(); ++i) {
@@ skipping 179 matching lines @@
       base::FilePath(path), L"",
       std::vector<base::string16>(root_links,
                                   root_links + arraysize(root_links))));
 
   HRESULT res;
 
   // Sets up a special history link.
   base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
   res = url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
                                         CLSCTX_INPROC_SERVER);
   ASSERT_TRUE(res == S_OK);

[gab, 2014/12/23 22:00:58]

It's kind of overkill to store |res| in a variable only to assert it. And it's
ugly to re-use the same variable to do this over and over again.

Could you please inline the calls inside the asserts and get rid of |res|?

Thanks!

[Alexey Seren, 2014/12/24 07:23:19]

Acknowledged.

-  res = url_history_stg2->AddUrl(kIEIdentifyUrl, kIEIdentifyTitle, 0);
+  // Usage of ADDURL_ADDTOHISTORYANDCACHE and ADDURL_ADDTOCACHE flags
+  // is explained in the article:
+  // http://msdn.microsoft.com/ru-ru/aa767730
+  res = url_history_stg2->AddUrl(kIEIdentifyUrl, kIEIdentifyTitle,
+                                 ADDURL_ADDTOHISTORYANDCACHE);
+  ASSERT_TRUE(res == S_OK);
+  res = url_history_stg2->AddUrl(kIECacheItemUrl, kIECacheItemTitle,
+                                 ADDURL_ADDTOCACHE);
   ASSERT_TRUE(res == S_OK);
 
   // Starts to import the above settings.
   // Deletes itself.
   ExternalProcessImporterHost* host = new ExternalProcessImporterHost;
   TestObserver* observer = new TestObserver(
       importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
       TestObserver::IE6);
   host->set_observer(observer);
 
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_IE;
   source_profile.source_path = temp_dir_.path();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HISTORY | importer::PASSWORDS | importer::FAVORITES,
       observer);
   base::MessageLoop::current()->Run();
 
   // Cleans up.
   url_history_stg2->DeleteUrl(kIEIdentifyUrl, 0);
+  url_history_stg2->DeleteUrl(kIECacheItemUrl, 0);
   url_history_stg2.Release();
 }
 
 IN_PROC_BROWSER_TEST_F(IEImporterBrowserTest,
                        IEImporterMalformedFavoritesRegistry) {
   // Sets up a favorites folder.
   base::FilePath path = temp_dir_.path().AppendASCII("Favorites");
   CreateDirectory(path.value().c_str(), NULL);
   CreateDirectory(path.AppendASCII("b").value().c_str(), NULL);
   ASSERT_TRUE(CreateUrlFile(path.AppendASCII("a.url"),
@@ skipping 109 matching lines @@
   source_profile.source_path = temp_dir_.path();
 
   host->StartImportSettings(
       source_profile,
       browser()->profile(),
       importer::HOME_PAGE,
       observer);
   base::MessageLoop::current()->Run();
 }