Omnibox - Open Search - Handle Lack of Short Name Smartly

chrome/browser/search_engines/template_url_fetcher_unittest.cc

 // 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 "components/search_engines/template_url_fetcher.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
@@ skipping 164 matching lines @@
   const TemplateURL* t_url = test_util()->model()->GetTemplateURLForKeyword(
       keyword);
   ASSERT_TRUE(t_url);
   EXPECT_EQ(ASCIIToUTF16("http://example.com/%s/other_stuff"),
             t_url->url_ref().DisplayURL(
                 test_util()->model()->search_terms_data()));
   EXPECT_EQ(ASCIIToUTF16("Simple Search"), t_url->short_name());
   EXPECT_TRUE(t_url->safe_for_autoreplace());
 }
 
+// This test is exactly like BasicAutodetectedTest except the xml file
+// provided doesn't include a short name for the search engine.  We should
+// fall back to the hostname.
+TEST_F(TemplateURLFetcherTest, InvalidShortName) {
+  base::string16 keyword(ASCIIToUTF16("test"));
+
+  test_util()->ChangeModelToLoadState();
+  ASSERT_FALSE(test_util()->model()->GetTemplateURLForKeyword(keyword));

[Peter Kasting, 2017/05/26 01:38:39]

Nit: I'd remove all the checks here that just duplicate the test above and make
this test simply about the short name fallback.

So, doesn't seem like we really care about this

[Mark P, 2017/05/26 21:56:26]

Removed unnecessary checks.  Kept this one, because otherwise it's possible this
test could pass if there's a template with this keyword remaining around.  This
is a useful precondition to check.

+
+  std::string osdd_file_name("simple_open_search_no_name.xml");
+  StartDownload(keyword, osdd_file_name, true);
+  EXPECT_EQ(0, requests_completed());

[Peter Kasting, 2017/05/26 01:38:39]

Nit: Or this

[Mark P, 2017/05/26 21:56:26]

Done.

+
+  WaitForDownloadToFinish();
+  EXPECT_EQ(1, requests_completed());

[Peter Kasting, 2017/05/26 01:38:39]

Nit: Or this

[Mark P, 2017/05/26 21:56:26]

Done.

+
+  const TemplateURL* t_url =
+      test_util()->model()->GetTemplateURLForKeyword(keyword);
+  ASSERT_TRUE(t_url);
+  EXPECT_EQ(
+      ASCIIToUTF16("http://example.com/%s/other_stuff"),
+      t_url->url_ref().DisplayURL(test_util()->model()->search_terms_data()));

[Peter Kasting, 2017/05/26 01:38:39]

Nit: Or this

[Mark P, 2017/05/26 21:56:26]

Done.

+  EXPECT_EQ(ASCIIToUTF16("example.com"), t_url->short_name());
+  EXPECT_TRUE(t_url->safe_for_autoreplace());

[Peter Kasting, 2017/05/26 01:38:39]

Nit: Or this

[Mark P, 2017/05/26 21:56:26]

Done.

+}
+
 TEST_F(TemplateURLFetcherTest, DuplicatesThrownAway) {
   base::string16 keyword(ASCIIToUTF16("test"));
 
   test_util()->ChangeModelToLoadState();
   ASSERT_FALSE(test_util()->model()->GetTemplateURLForKeyword(keyword));
 
   std::string osdd_file_name("simple_open_search.xml");
   StartDownload(keyword, osdd_file_name, true);
   EXPECT_EQ(0, requests_completed());
 
@@ skipping 74 matching lines @@
   std::string osdd_file_name("unicode_open_search.xml");
   StartDownload(keyword, osdd_file_name, true);
   WaitForDownloadToFinish();
   const TemplateURL* t_url =
       test_util()->model()->GetTemplateURLForKeyword(keyword);
   EXPECT_EQ(base::UTF8ToUTF16("\xd1\x82\xd0\xb5\xd1\x81\xd1\x82"),
             t_url->short_name());
 }
 
 }  // namespace