Added a check for the utf8 string input being empty (NULL).

chrome/renderer/external_extension_uitest.cc

 // Copyright (c) 2011 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 "base/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 10 matching lines @@
 
   IsSearchProviderTestData StartIsSearchProviderInstalledTest(
       BrowserProxy* browser_proxy,
       const char* host,
       const char* expected_result);
 
   void FinishIsSearchProviderInstalledTest(
       const IsSearchProviderTestData& data);
 
   net::TestServer test_server_;
+  GURL search_provider_test_url_;
   bool test_server_started_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SearchProviderTest);
 };
 
 SearchProviderTest::SearchProviderTest()
     : test_server_(net::TestServer::TYPE_HTTP,
                    FilePath(FILE_PATH_LITERAL("chrome/test/data"))),
       test_server_started_(false) {
   // The test_server is started in the constructor (rather than the test body)
   // so the mapping rules below can include the ephemeral port number.
   test_server_started_ = test_server_.Start();
   if (!test_server_started_)
     return;
 
   // Enable the search provider additions.
   launch_arguments_.AppendSwitch(switches::kEnableSearchProviderApiV2);
 
   // Map all hosts to our local server.
   std::string host_rule("MAP * " + test_server_.host_port_pair().ToString());
   launch_arguments_.AppendSwitchASCII(switches::kHostRules, host_rule);
+
+  // Get the url for the test page.
+  search_provider_test_url_ =
+      test_server_.GetURL("files/is_search_provider_installed.html");
 }
 
 struct IsSearchProviderTestData {
   IsSearchProviderTestData() {
   }
 
   IsSearchProviderTestData(TabProxy* t,
                            std::string h,
                            GURL url)
       : tab(t),
@@ skipping 23 matching lines @@
     return IsSearchProviderTestData();
   }
 
   scoped_refptr<TabProxy> tab(browser_proxy->GetTab(num_tabs));
   if (!tab.get()) {
     ADD_FAILURE() << "BrowserProxy::GetTab for the new tab failed.";
     return IsSearchProviderTestData();
   }
 
   // Go to the test page.
-  GURL local_url =
-      test_server_.GetURL("files/is_search_provider_installed.html");
-  GURL test_url(std::string("http://") + host + local_url.path() +
-                "#" + expected_result);
+  GURL test_url(std::string("http://") + host +
+                search_provider_test_url_.path() + "#" + expected_result);
   EXPECT_TRUE(tab->NavigateToURLAsync(test_url));
 
   // Bundle up information needed to verify the result.
   return IsSearchProviderTestData(tab, host, test_url);
 }
 
 void SearchProviderTest::FinishIsSearchProviderInstalledTest(
     const IsSearchProviderTestData& data) {
   ASSERT_TRUE(data.tab.get());
 
   std::string cookie_name = data.host + "testResult";
   std::string escaped_value =
       WaitUntilCookieNonEmpty(data.tab,
                               data.test_url,
                               cookie_name.c_str(),
                               TestTimeouts::action_max_timeout_ms());
 
   // Unescapes and normalizes the actual result.
   std::string value = UnescapeURLComponent(
       escaped_value,
       UnescapeRule::NORMAL | UnescapeRule::SPACES |
       UnescapeRule::URL_SPECIAL_CHARS | UnescapeRule::CONTROL_CHARS);
   value += "\n";
   ReplaceSubstringsAfterOffset(&value, 0, "\r", "");
   EXPECT_STREQ("1\n", value.c_str());
+  EXPECT_TRUE(data.tab->Close(true));
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=62777
 TEST_F(SearchProviderTest, FLAKY_TestIsSearchProviderInstalled) {
   ASSERT_TRUE(test_server_started_);
 
   // Use the default search provider, other installed search provider, and
   // one not installed as well. (Note that yahoo isn't tested because the
   // its host name varies a lot for different locales unlike Google and Bing,
   // which would make the test fail depending on the machine's locale.)
@@ skipping 31 matching lines @@
 #if 0
   // Remove the calls to FinishIsSearchProviderInstalledTest above when
   // re-enabling this code.
 
   // Do the verification.
   for (size_t i = 0; i < arraysize(test_data); ++i) {
     FinishIsSearchProviderInstalledTest(test_data[i]);
   }
 #endif
 }
+
+TEST_F(SearchProviderTest, TestIsSearchProviderInstalledWithException) {
+  // Change the url for the test page to one that throws an exception when
+  // toString is called on the argument given to isSearchProviderInstalled.
+  search_provider_test_url_ = test_server_.GetURL(
+      "files/is_search_provider_installed_with_exception.html");
+
+  scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
+  FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest(
+      browser, "www.google.com", ""));
+}