| Index: chrome/browser/importer/ie_importer_browsertest_win.cc
|
| diff --git a/chrome/browser/importer/ie_importer_browsertest_win.cc b/chrome/browser/importer/ie_importer_browsertest_win.cc
|
| index eb52807f503ce4c9fc3d243a15d2538971abfbf3..ed2202f3f9a82803437ad6a32155626a1fc6bc8f 100644
|
| --- a/chrome/browser/importer/ie_importer_browsertest_win.cc
|
| +++ b/chrome/browser/importer/ie_importer_browsertest_win.cc
|
| @@ -21,9 +21,9 @@
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| -#include "base/stl_util.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -318,14 +318,6 @@ class TestObserver : public ProfileWriter,
|
| }
|
| }
|
|
|
| - virtual void AddKeyword(std::vector<TemplateURL*> template_url,
|
| - int default_keyword_index) {
|
| - // TODO(jcampan): bug 1169230: we should test keyword importing for IE.
|
| - // In order to do that we'll probably need to mock the Windows registry.
|
| - NOTREACHED();
|
| - base::STLDeleteContainerPointers(template_url.begin(), template_url.end());
|
| - }
|
| -
|
| void AddFavicons(const favicon_base::FaviconUsageDataList& usage) override {
|
| // Importer should group the favicon information for each favicon URL.
|
| for (size_t i = 0; i < arraysize(kIEFaviconGroup); ++i) {
|
|
|