Importing certain bookmarks from firefox and HTML file as search engines.

chrome/browser/importer/in_process_importer_bridge.cc

Index: chrome/browser/importer/in_process_importer_bridge.cc
diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc
index 3bd1fde5be8c905e1ea3b3014adf69bb691b80f0..178fd63b3cab9d7a1db588d59c0f39fcb4fc35c5 100644
--- a/chrome/browser/importer/in_process_importer_bridge.cc
+++ b/chrome/browser/importer/in_process_importer_bridge.cc
@@ -91,25 +91,30 @@ class FirefoxURLParameterFilter : public TemplateURLParser::ParameterFilter {
   DISALLOW_COPY_AND_ASSIGN(FirefoxURLParameterFilter);
 };
 
-// Creates a TemplateURL with the |keyword| and |url|. |title| may be empty.
+// Attempts to create a TemplateURL from the provided data. |title| is optional.
+// If |keyword| is not specified, the function will attempt to generate the
+// keyword from |url|, which in that case must be a valid GURL. This can fail if
+// e.g. the replacement term is in the host. If TemplateURL creation fails,
+// returns NULL.
 // This function transfers ownership of the created TemplateURL to the caller.
 TemplateURL* CreateTemplateURL(const base::string16& title,
                                const base::string16& keyword,
-                               const GURL& url) {
-  // Skip if the url is invalid.
-  if (!url.is_valid())
+                               const base::string16& url) {
+  if (url.empty())
     return NULL;
-
   TemplateURLData data;
-  if (keyword.empty())
-    data.SetKeyword(TemplateURL::GenerateKeyword(url));
-  else
+  if (keyword.empty()) {
+    GURL gurl(url);
+    if (!gurl.is_valid())
+      return NULL;
+    data.SetKeyword(TemplateURL::GenerateKeyword(gurl));
+  } else {
     data.SetKeyword(keyword);
+  }
   // We set short name by using the title if it exists.
   // Otherwise, we use the shortcut.
   data.short_name = title.empty() ? keyword : title;

[Peter Kasting, 2014/12/09 23:10:19]

I think this should be "keyword()" instead of "keyword" here, so that if we
generate the keyword, we still have a title.

You should probably ensure one of the tests checks for this (i.e. that entries
with autogenerated keywords have a non-empty title).

However, see later comments about my skepticism that we actually want to allow
keyword autogeneration for imports at all.

[Tapu Ghose, 2014/12/10 04:41:55]

Made use of "data.keyword()" instead of "keyword".

 
Updated logic to reflect your skepticism regarding keyword autogeneration for
bookmark import. Hence, this test check is not necessary.
 
Based on your skepticism I have updated the logic such that we do not import
bookmarks that have empty keyword. In other words, we do not need keyword
autogeneration for bookmark import. However, I have not removed the existing
logic for autogenerating keyword from this function. I was wondering if I should
remove this in order to make the code cleaner. I hope cleaning this won't break
something else.

[Peter Kasting, 2014/12/10 17:41:16]

Well, where else is this called from?  You should remove it if we don't need it,
and if we do need it, you should document why.

[Tapu Ghose, 2014/12/11 03:12:21]

Looks like this is called while importing bookmark from HTML file or browser. In
both cases, before calling this function, we make a check if keyword is
non-empty. This means it is safe enough if the logic for keyword autogeneration
is removed.

-  data.SetURL(
-      TemplateURLRef::DisplayURLToURLRef(base::UTF8ToUTF16(url.spec())));
+  data.SetURL(TemplateURLRef::DisplayURLToURLRef(url));
   return new TemplateURL(data);
 }
 
@@ -221,14 +226,16 @@ void InProcessImporterBridge::SetHistoryItems(
 }
 
 void InProcessImporterBridge::SetKeywords(
-    const std::vector<importer::URLKeywordInfo>& url_keywords,
+    const std::vector<importer::SearchEngineInfo>& search_engines,
     bool unique_on_host_and_path) {
   ScopedVector<TemplateURL> owned_template_urls;
-  for (size_t i = 0; i < url_keywords.size(); ++i) {
-    owned_template_urls.push_back(
-        CreateTemplateURL(url_keywords[i].display_name,
-                          url_keywords[i].keyword,
-                          url_keywords[i].url));
+  TemplateURL* owned_template_url;

[Peter Kasting, 2014/12/09 23:10:19]

Nit: Declare this where it's defined, in the loop below, since we don't need its
lifetime to extend beyond the loop end.

[Tapu Ghose, 2014/12/10 04:41:55]

Agreed.

+  for (const auto& search_engine : search_engines) {
+    owned_template_url = CreateTemplateURL(search_engine.display_name,
+                             search_engine.keyword,
+                             search_engine.url);
+    if (owned_template_url)
+      owned_template_urls.push_back(owned_template_url);
   }
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&ProfileWriter::AddKeywords, writer_,