Port some importer unit tests to browser tests to be able to fully exercise the ExternalProcessImpo…

Port some importer unit tests to browser tests to be able to fully exercise the ExternalProcessImporterHost.

These need to be browser_tests as the ExternalProcessImporterHost uses a utility process (which unit_tests don't support). Safari/toolbar importer tests don't need to be made into browser tests as Firefox tests are sufficient to exercise ExternalProcessImporterHost on every platform (and the IE tests are necessary to exercise some extra Windows-specific COM magic coming as part of http://crbug.com/219419).

For now only Mac uses the ExternalProcessImporterHost, but Windows and Linux will be ported over in upcoming CLs.

Enhanced importer_unittest_utils to have better error reporting (i.e. instead of just returning false on failed comparison which was hard to diagnose).

Precursor CL to https://codereview.chromium.org/12670013

TBR=ben@chromium.org
BUG=219419, 22142
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=196518

[gab, 2013-04-18 18:09:44]

Miranda, please take a look :)!

Cheers!
Gab

https://codereview.chromium.org/13954013/diff/2001/chrome/browser/importer/fi...
File chrome/browser/importer/firefox_importer_browsertest.cc (right):

https://codereview.chromium.org/13954013/diff/2001/chrome/browser/importer/fi...
chrome/browser/importer/firefox_importer_browsertest.cc:57: {false, 1, {L"< > &
\" ' \\ /"},
Was missing from the list of actually imported test bookmarks
(https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/data/f...).

Adding it allows us to use a 1-by-1 strict equality test below instead of using
the less strict (and now removed) FindBookmarkEntry().

[Miranda Callahan, 2013-04-18 18:25:19]

Great CL -- LGTM, thanks!

https://codereview.chromium.org/13954013/diff/2001/chrome/browser/importer/fi...
File chrome/browser/importer/firefox_importer_browsertest.cc (right):

https://codereview.chromium.org/13954013/diff/2001/chrome/browser/importer/fi...
chrome/browser/importer/firefox_importer_browsertest.cc:57: {false, 1, {L"< > &
\" ' \\ /"},
Nice catch!

On 2013/04/18 18:09:44, gab wrote:
> Was missing from the list of actually imported test bookmarks
>
(https://code.google.com/p/chromium/codesearch#chromium/src/chrome/test/data/f...).
> 
> Adding it allows us to use a 1-by-1 strict equality test below instead of
using
> the less strict (and now removed) FindBookmarkEntry().

[gab, 2013-04-18 19:38:35]

Thanks, added more explanations to the description as to why these need to be
browser_tests.

Cheers!
Gab

[gab, 2013-04-23 22:48:23]

TBR ben for gyp changes.

Thanks!
Gab

[commit-bot: I haz the power, 2013-04-24 20:01:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/13954013/17001

[commit-bot: I haz the power, 2013-04-24 20:01:15]

Failed to apply patch for
chrome/browser/importer/ie_importer_browsertest_win.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         chrome/browser/importer/ie_importer_browsertest_win.cc
  Copied chrome/browser/importer/ie_importer_unittest_win.cc ->
chrome/browser/importer/ie_importer_browsertest_win.cc
  patching file chrome/browser/importer/ie_importer_browsertest_win.cc
  Hunk #1 FAILED at 1.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/importer/ie_importer_browsertest_win.cc.rej

Patch:   NR 
chrome/browser/importer/ie_importer_unittest_win.cc->chrome/browser/importer/ie_importer_browsertest_win.cc
Index: chrome/browser/importer/ie_importer_browsertest_win.cc
diff --git a/chrome/browser/importer/ie_importer_unittest_win.cc
b/chrome/browser/importer/ie_importer_browsertest_win.cc
similarity index 84%
copy from chrome/browser/importer/ie_importer_unittest_win.cc
copy to chrome/browser/importer/ie_importer_browsertest_win.cc
index
2b229aa400eb75a379cfdf29fc9ba18e2cbcd659..d7f9bf338a943bf33642091764d00c2900127bd6
100644
--- a/chrome/browser/importer/ie_importer_unittest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -1,652 +1,608 @@
-// Copyright (c) 2012 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"
-
-// The order of these includes is important.
-#include <windows.h>
-#include <unknwn.h>
-#include <intshcut.h>
-#include <shlguid.h>
-#include <urlhist.h>
-#include <shlobj.h>
-#include <propvarutil.h>
-
-#include <algorithm>
-#include <vector>
-
-#include "base/bind.h"
-#include "base/compiler_specific.h"
-#include "base/file_util.h"
-#include "base/message_loop.h"
-#include "base/path_service.h"
-#include "base/stl_util.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "base/win/registry.h"
-#include "base/win/scoped_com_initializer.h"
-#include "base/win/scoped_comptr.h"
-#include "base/win/scoped_propvariant.h"
-#include "base/win/windows_version.h"
-#include "chrome/browser/history/history_types.h"
-#include "chrome/browser/importer/ie_importer.h"
-#include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/browser/importer/importer_data_types.h"
-#include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/importer/importer_progress_observer.h"
-#include "chrome/browser/importer/importer_unittest_utils.h"
-#include "chrome/browser/importer/pstore_declarations.h"
-#include "chrome/browser/password_manager/ie7_password.h"
-#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/testing_profile.h"
-#include "content/public/common/password_form.h"
-
-namespace {
-
-const char16 kUnitTestRegistrySubKey[] = L"SOFTWARE\\Chromium Unit Tests";
-const char16 kUnitTestUserOverrideSubKey[] =
-    L"SOFTWARE\\Chromium Unit Tests\\HKCU Override";
-
-const BookmarkInfo kIEBookmarks[] = {
-  {true, 2, {L"Links", L"SubFolderOfLinks"},
-   L"SubLink",
-   "http://www.links-sublink.com/"},
-  {true, 1, {L"Links"},
-   L"TheLink",
-   "http://www.links-thelink.com/"},
-  {false, 0, {},
-   L"Google Home Page",
-   "http://www.google.com/"},
-  {false, 0, {},
-   L"TheLink",
-   "http://www.links-thelink.com/"},
-  {false, 1, {L"SubFolder"},
-   L"Title",
-   "http://www.link.com/"},
-  {false, 0, {},
-   L"WithPortAndQuery",
-   "http://host:8080/cgi?q=query"},
-  {false, 1, {L"a"},
-   L"\x4E2D\x6587",
-   "http://chinese-title-favorite/"},
-  {false, 0, {},
-   L"SubFolder",
-   "http://www.subfolder.com/"},
-};
-
-const BookmarkInfo kIESortedBookmarks[] = {
-  {false, 0, {}, L"a", "http://www.google.com/0"},
-  {false, 1, {L"b"}, L"a", "http://www.google.com/1"},
-  {false, 1, {L"b"}, L"b", "http://www.google.com/2"},
-  {false, 0, {}, L"c", "http://www.google.com/3"},
-};
-
-const char16 kIEIdentifyUrl[] =
-    L"http://A79029D6-753E-4e27-B807-3D46AB1545DF.com:8080/path?key=value";
-const char16 kIEIdentifyTitle[] =
-    L"Unittest GUID";
-
-const char16 kIEFavoritesOrderKey[] =
-    L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\"
-    L"MenuOrder\\Favorites";
-
-const 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
-    "\x18\x00"          // 24-bits
-    "\x00\xFF\x00\x00"; // The pixel
-
-struct FaviconGroup {
-  const char16* favicon_url;
-  const char16* site_url[2];
-};
-
-const FaviconGroup kIEFaviconGroup[2] = {
-  {L"http://www.google.com/favicon.ico",
-   {L"http://www.google.com/",
-    L"http://www.subfolder.com/"}},
-  {L"http://example.com/favicon.ico",
-   {L"http://host:8080/cgi?q=query",
-    L"http://chinese-title-favorite/"}},
-};
-
-bool CreateOrderBlob(const base::FilePath& favorites_folder,
-                     const string16& path,
-                     const std::vector<string16>& entries) {
-  if (entries.size() > 255)
-    return false;
-
-  // Create a binary sequence for setting a specific order of favorites.
-  // The format depends on the version of Shell32.dll, so we cannot embed
-  // a binary constant here.
-  std::vector<uint8> blob(20, 0);
-  blob[16] = static_cast<uint8>(entries.size());
-
-  for (size_t i = 0; i < entries.size(); ++i) {
-    PIDLIST_ABSOLUTE id_list_full = ILCreateFromPath(
-        favorites_folder.Append(path).Append(entries[i]).value().c_str());
-    PUITEMID_CHILD id_list = ILFindLastID(id_list_full);
-    // Include the trailing zero-length item id.  Don't include the single
-    // element array.
-    size_t id_list_size = id_list->mkid.cb + sizeof(id_list->mkid.cb);
-
-    blob.resize(blob.size() + 8);
-    uint32 total_size = id_list_size + 8;
-    memcpy(&blob[blob.size() - 8], &total_size, 4);
-    uint32 sort_index = i;
-    memcpy(&blob[blob.size() - 4], &sort_index, 4);
-    blob.resize(blob.size() + id_list_size);
-    memcpy(&blob[blob.size() - id_list_size], id_list, id_list_size);
-    ILFree(id_list_full);
-  }
-
-  string16 key_path = kIEFavoritesOrderKey;
-  if (!path.empty())
-    key_path += L"\\" + path;
-  base::win::RegKey key;
-  if (key.Create(HKEY_CURRENT_USER, key_path.c_str(), KEY_WRITE) !=
-      ERROR_SUCCESS) {
-    return false;
-  }
-  if (key.WriteValue(L"Order", &blob[0], blob.size(), REG_BINARY) !=
-      ERROR_SUCCESS) {
-    return false;
-  }
-  return true;
-}
-
-bool CreateUrlFileWithFavicon(const base::FilePath& file,
-                              const std::wstring& url,
-                              const std::wstring& favicon_url) {
-  base::win::ScopedComPtr<IUniformResourceLocator> locator;
-  HRESULT result = locator.CreateInstance(CLSID_InternetShortcut, NULL,
-                                          CLSCTX_INPROC_SERVER);
-  if (FAILED(result))
-    return false;
-  base::win::ScopedComPtr<IPersistFile> persist_file;
-  result = persist_file.QueryFrom(locator);
-  if (FAILED(result))
-    return false;
-  result = locator->SetURL(url.c_str(), 0);
-  if (FAILED(result))
-    return false;
-
-  // Write favicon url if specified.
-  if (!favicon_url.empty()) {
-    base::win::ScopedComPtr<IPropertySetStorage> property_set_storage;
-    if (FAILED(property_set_storage.QueryFrom(locator)))
-      return false;
-    base::win::ScopedComPtr<IPropertyStorage> property_storage;
-    if (FAILED(property_set_storage->Open(FMTID_Intshcut,
-                                          STGM_WRITE,
-                                          property_storage.Receive()))) {
-      return false;
-    }
-    PROPSPEC properties[] = {{PRSPEC_PROPID, PID_IS_ICONFILE}};
-    // WriteMultiple takes an array of PROPVARIANTs, but since this code only
-    // needs an array of size 1: a pointer to |pv_icon| is equivalent.
-    base::win::ScopedPropVariant pv_icon;
-    if (FAILED(InitPropVariantFromString(favicon_url.c_str(),
-                                         pv_icon.Receive())) ||
-        FAILED(property_storage->WriteMultiple(1, properties, &pv_icon, 0))) {
-      return false;
-    }
-  }
-
-  // Save the .url file.
-  result = persist_file->Save(file.value().c_str(), TRUE);
-  if (FAILED(result))
-    return false;
-
-  // Write dummy favicon image data in NTFS alternate data stream.
-  return favicon_url.empty() || (file_util::WriteFile(
-      file.ReplaceExtension(kFaviconStreamSuffix), kDummyFaviconImageData,
-      sizeof kDummyFaviconImageData) != -1);
-}
-
-bool CreateUrlFile(const base::FilePath& file, const std::wstring& url) {
-  return CreateUrlFileWithFavicon(file, url, std::wstring());
-}
-
-void ClearPStoreType(IPStore* pstore, const GUID* type, const GUID* subtype) {
-  base::win::ScopedComPtr<IEnumPStoreItems, NULL> item;
-  HRESULT result = pstore->EnumItems(0, type, subtype, 0, item.Receive());
-  if (result == PST_E_OK) {
-    char16* item_name;
-    while (SUCCEEDED(item->Next(1, &item_name, 0))) {
-      pstore->DeleteItem(0, type, subtype, item_name, NULL, 0);
-      CoTaskMemFree(item_name);
-    }
-  }
-  pstore->DeleteSubtype(0, type, subtype, 0);
-  pstore->DeleteType(0, type, 0);
-}
-
-void WritePStore(IPStore* pstore, const GUID* type, const GUID* subtype) {
-  struct PStoreItem {
-    char16* name;
-    int data_size;
-    char* data;
-  } items[] = {
-    {L"http://localhost:8080/security/index.htm#ref:StringData", 8,
-     "\x31\x00\x00\x00\x32\x00\x00\x00"},
-    {L"http://localhost:8080/security/index.htm#ref:StringIndex", 20,
-     "\x57\x49\x43\x4b\x18\x00\x00\x00\x02\x00"
-     "\x00\x00\x2f\x00\x74\x00\x01\x00\x00\x00"},
-    {L"user:StringData", 4,
-     "\x31\x00\x00\x00…
(message too large)

[commit-bot: I haz the power, 2013-04-24 21:44:27]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/13954013/17001

[commit-bot: I haz the power, 2013-04-24 21:44:30]

Failed to apply patch for
chrome/browser/importer/ie_importer_browsertest_win.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  A         chrome/browser/importer/ie_importer_browsertest_win.cc
  Copied chrome/browser/importer/ie_importer_unittest_win.cc ->
chrome/browser/importer/ie_importer_browsertest_win.cc
  patching file chrome/browser/importer/ie_importer_browsertest_win.cc
  Hunk #1 FAILED at 1.
  1 out of 1 hunk FAILED -- saving rejects to file
chrome/browser/importer/ie_importer_browsertest_win.cc.rej

Patch:   NR 
chrome/browser/importer/ie_importer_unittest_win.cc->chrome/browser/importer/ie_importer_browsertest_win.cc
Index: chrome/browser/importer/ie_importer_browsertest_win.cc
diff --git a/chrome/browser/importer/ie_importer_unittest_win.cc
b/chrome/browser/importer/ie_importer_browsertest_win.cc
similarity index 84%
copy from chrome/browser/importer/ie_importer_unittest_win.cc
copy to chrome/browser/importer/ie_importer_browsertest_win.cc
index
2b229aa400eb75a379cfdf29fc9ba18e2cbcd659..d7f9bf338a943bf33642091764d00c2900127bd6
100644
--- a/chrome/browser/importer/ie_importer_unittest_win.cc
+++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
@@ -1,652 +1,608 @@
-// Copyright (c) 2012 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"
-
-// The order of these includes is important.
-#include <windows.h>
-#include <unknwn.h>
-#include <intshcut.h>
-#include <shlguid.h>
-#include <urlhist.h>
-#include <shlobj.h>
-#include <propvarutil.h>
-
-#include <algorithm>
-#include <vector>
-
-#include "base/bind.h"
-#include "base/compiler_specific.h"
-#include "base/file_util.h"
-#include "base/message_loop.h"
-#include "base/path_service.h"
-#include "base/stl_util.h"
-#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
-#include "base/win/registry.h"
-#include "base/win/scoped_com_initializer.h"
-#include "base/win/scoped_comptr.h"
-#include "base/win/scoped_propvariant.h"
-#include "base/win/windows_version.h"
-#include "chrome/browser/history/history_types.h"
-#include "chrome/browser/importer/ie_importer.h"
-#include "chrome/browser/importer/importer_bridge.h"
-#include "chrome/browser/importer/importer_data_types.h"
-#include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/importer/importer_progress_observer.h"
-#include "chrome/browser/importer/importer_unittest_utils.h"
-#include "chrome/browser/importer/pstore_declarations.h"
-#include "chrome/browser/password_manager/ie7_password.h"
-#include "chrome/browser/search_engines/template_url.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/test/base/testing_profile.h"
-#include "content/public/common/password_form.h"
-
-namespace {
-
-const char16 kUnitTestRegistrySubKey[] = L"SOFTWARE\\Chromium Unit Tests";
-const char16 kUnitTestUserOverrideSubKey[] =
-    L"SOFTWARE\\Chromium Unit Tests\\HKCU Override";
-
-const BookmarkInfo kIEBookmarks[] = {
-  {true, 2, {L"Links", L"SubFolderOfLinks"},
-   L"SubLink",
-   "http://www.links-sublink.com/"},
-  {true, 1, {L"Links"},
-   L"TheLink",
-   "http://www.links-thelink.com/"},
-  {false, 0, {},
-   L"Google Home Page",
-   "http://www.google.com/"},
-  {false, 0, {},
-   L"TheLink",
-   "http://www.links-thelink.com/"},
-  {false, 1, {L"SubFolder"},
-   L"Title",
-   "http://www.link.com/"},
-  {false, 0, {},
-   L"WithPortAndQuery",
-   "http://host:8080/cgi?q=query"},
-  {false, 1, {L"a"},
-   L"\x4E2D\x6587",
-   "http://chinese-title-favorite/"},
-  {false, 0, {},
-   L"SubFolder",
-   "http://www.subfolder.com/"},
-};
-
-const BookmarkInfo kIESortedBookmarks[] = {
-  {false, 0, {}, L"a", "http://www.google.com/0"},
-  {false, 1, {L"b"}, L"a", "http://www.google.com/1"},
-  {false, 1, {L"b"}, L"b", "http://www.google.com/2"},
-  {false, 0, {}, L"c", "http://www.google.com/3"},
-};
-
-const char16 kIEIdentifyUrl[] =
-    L"http://A79029D6-753E-4e27-B807-3D46AB1545DF.com:8080/path?key=value";
-const char16 kIEIdentifyTitle[] =
-    L"Unittest GUID";
-
-const char16 kIEFavoritesOrderKey[] =
-    L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\"
-    L"MenuOrder\\Favorites";
-
-const 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
-    "\x18\x00"          // 24-bits
-    "\x00\xFF\x00\x00"; // The pixel
-
-struct FaviconGroup {
-  const char16* favicon_url;
-  const char16* site_url[2];
-};
-
-const FaviconGroup kIEFaviconGroup[2] = {
-  {L"http://www.google.com/favicon.ico",
-   {L"http://www.google.com/",
-    L"http://www.subfolder.com/"}},
-  {L"http://example.com/favicon.ico",
-   {L"http://host:8080/cgi?q=query",
-    L"http://chinese-title-favorite/"}},
-};
-
-bool CreateOrderBlob(const base::FilePath& favorites_folder,
-                     const string16& path,
-                     const std::vector<string16>& entries) {
-  if (entries.size() > 255)
-    return false;
-
-  // Create a binary sequence for setting a specific order of favorites.
-  // The format depends on the version of Shell32.dll, so we cannot embed
-  // a binary constant here.
-  std::vector<uint8> blob(20, 0);
-  blob[16] = static_cast<uint8>(entries.size());
-
-  for (size_t i = 0; i < entries.size(); ++i) {
-    PIDLIST_ABSOLUTE id_list_full = ILCreateFromPath(
-        favorites_folder.Append(path).Append(entries[i]).value().c_str());
-    PUITEMID_CHILD id_list = ILFindLastID(id_list_full);
-    // Include the trailing zero-length item id.  Don't include the single
-    // element array.
-    size_t id_list_size = id_list->mkid.cb + sizeof(id_list->mkid.cb);
-
-    blob.resize(blob.size() + 8);
-    uint32 total_size = id_list_size + 8;
-    memcpy(&blob[blob.size() - 8], &total_size, 4);
-    uint32 sort_index = i;
-    memcpy(&blob[blob.size() - 4], &sort_index, 4);
-    blob.resize(blob.size() + id_list_size);
-    memcpy(&blob[blob.size() - id_list_size], id_list, id_list_size);
-    ILFree(id_list_full);
-  }
-
-  string16 key_path = kIEFavoritesOrderKey;
-  if (!path.empty())
-    key_path += L"\\" + path;
-  base::win::RegKey key;
-  if (key.Create(HKEY_CURRENT_USER, key_path.c_str(), KEY_WRITE) !=
-      ERROR_SUCCESS) {
-    return false;
-  }
-  if (key.WriteValue(L"Order", &blob[0], blob.size(), REG_BINARY) !=
-      ERROR_SUCCESS) {
-    return false;
-  }
-  return true;
-}
-
-bool CreateUrlFileWithFavicon(const base::FilePath& file,
-                              const std::wstring& url,
-                              const std::wstring& favicon_url) {
-  base::win::ScopedComPtr<IUniformResourceLocator> locator;
-  HRESULT result = locator.CreateInstance(CLSID_InternetShortcut, NULL,
-                                          CLSCTX_INPROC_SERVER);
-  if (FAILED(result))
-    return false;
-  base::win::ScopedComPtr<IPersistFile> persist_file;
-  result = persist_file.QueryFrom(locator);
-  if (FAILED(result))
-    return false;
-  result = locator->SetURL(url.c_str(), 0);
-  if (FAILED(result))
-    return false;
-
-  // Write favicon url if specified.
-  if (!favicon_url.empty()) {
-    base::win::ScopedComPtr<IPropertySetStorage> property_set_storage;
-    if (FAILED(property_set_storage.QueryFrom(locator)))
-      return false;
-    base::win::ScopedComPtr<IPropertyStorage> property_storage;
-    if (FAILED(property_set_storage->Open(FMTID_Intshcut,
-                                          STGM_WRITE,
-                                          property_storage.Receive()))) {
-      return false;
-    }
-    PROPSPEC properties[] = {{PRSPEC_PROPID, PID_IS_ICONFILE}};
-    // WriteMultiple takes an array of PROPVARIANTs, but since this code only
-    // needs an array of size 1: a pointer to |pv_icon| is equivalent.
-    base::win::ScopedPropVariant pv_icon;
-    if (FAILED(InitPropVariantFromString(favicon_url.c_str(),
-                                         pv_icon.Receive())) ||
-        FAILED(property_storage->WriteMultiple(1, properties, &pv_icon, 0))) {
-      return false;
-    }
-  }
-
-  // Save the .url file.
-  result = persist_file->Save(file.value().c_str(), TRUE);
-  if (FAILED(result))
-    return false;
-
-  // Write dummy favicon image data in NTFS alternate data stream.
-  return favicon_url.empty() || (file_util::WriteFile(
-      file.ReplaceExtension(kFaviconStreamSuffix), kDummyFaviconImageData,
-      sizeof kDummyFaviconImageData) != -1);
-}
-
-bool CreateUrlFile(const base::FilePath& file, const std::wstring& url) {
-  return CreateUrlFileWithFavicon(file, url, std::wstring());
-}
-
-void ClearPStoreType(IPStore* pstore, const GUID* type, const GUID* subtype) {
-  base::win::ScopedComPtr<IEnumPStoreItems, NULL> item;
-  HRESULT result = pstore->EnumItems(0, type, subtype, 0, item.Receive());
-  if (result == PST_E_OK) {
-    char16* item_name;
-    while (SUCCEEDED(item->Next(1, &item_name, 0))) {
-      pstore->DeleteItem(0, type, subtype, item_name, NULL, 0);
-      CoTaskMemFree(item_name);
-    }
-  }
-  pstore->DeleteSubtype(0, type, subtype, 0);
-  pstore->DeleteType(0, type, 0);
-}
-
-void WritePStore(IPStore* pstore, const GUID* type, const GUID* subtype) {
-  struct PStoreItem {
-    char16* name;
-    int data_size;
-    char* data;
-  } items[] = {
-    {L"http://localhost:8080/security/index.htm#ref:StringData", 8,
-     "\x31\x00\x00\x00\x32\x00\x00\x00"},
-    {L"http://localhost:8080/security/index.htm#ref:StringIndex", 20,
-     "\x57\x49\x43\x4b\x18\x00\x00\x00\x02\x00"
-     "\x00\x00\x2f\x00\x74\x00\x01\x00\x00\x00"},
-    {L"user:StringData", 4,
-     "\x31\x00\x00\x00…
(message too large)

[commit-bot: I haz the power, 2013-04-25 15:49:22]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/13954013/31002

[commit-bot: I haz the power, 2013-04-25 16:00:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/13954013/32005

[commit-bot: I haz the power, 2013-04-25 19:13:53]

Retried try job too often on win7_aura for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win7_aura&...

[commit-bot: I haz the power, 2013-04-25 21:19:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/gab@chromium.org/13954013/32005

[commit-bot: I haz the power, 2013-04-25 22:50:42]

Change committed as 196518