GURL::Replacements methods accept a StringPiece instead of std::string&.

chrome/browser/extensions/chrome_app_api_browsertest.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 <string>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 83 matching lines @@
   }
 };
 
 // Flaky http://crbug.com/238674
 #if defined(OS_WIN)
 #define MAYBE_IsInstalled DISABLED_IsInstalled
 #else
 #define MAYBE_IsInstalled IsInstalled
 #endif
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, MAYBE_IsInstalled) {
-  std::string app_host("app.com");
-  std::string nonapp_host("nonapp.com");
+  static const char kAppHost[] = "app.com";
+  static const char kNonAppHost[] = "nonapp.com";
 
-  host_resolver()->AddRule(app_host, "127.0.0.1");
-  host_resolver()->AddRule(nonapp_host, "127.0.0.1");
+  host_resolver()->AddRule(kAppHost, "127.0.0.1");
+  host_resolver()->AddRule(kNonAppHost, "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   GURL test_file_url(test_server()->GetURL("extensions/test_file.html"));
   GURL::Replacements replace_host;
 
-  replace_host.SetHostStr(app_host);
+  replace_host.SetHostStr(kAppHost);
   GURL app_url(test_file_url.ReplaceComponents(replace_host));
 
-  replace_host.SetHostStr(nonapp_host);
+  replace_host.SetHostStr(kNonAppHost);
   GURL non_app_url(test_file_url.ReplaceComponents(replace_host));
 
   // Before the app is installed, app.com does not think that it is installed
   ui_test_utils::NavigateToURL(browser(), app_url);
   EXPECT_FALSE(IsAppInstalledInMainFrame());
 
   // Load an app which includes app.com in its extent.
   const Extension* extension = LoadExtension(
       test_data_dir_.AppendASCII("app_dot_com_app"));
   ASSERT_TRUE(extension);
@@ skipping 53 matching lines @@
           "        }"
           "    }()"
           ");",
           &result));
 
   // Should not be able to alter window.chrome.app.isInstalled from javascript";
   EXPECT_EQ("true", result);
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) {
-  std::string app_host("app.com");
-  std::string nonapp_host("nonapp.com");
-  std::string checkout_host("checkout.com");
+  const char kAppHost[] = "app.com";
+  const char kNonAppHost[] = "nonapp.com";
+  const char kCheckoutHost[] = "checkout.com";
 
-  host_resolver()->AddRule(app_host, "127.0.0.1");
-  host_resolver()->AddRule(nonapp_host, "127.0.0.1");
-  host_resolver()->AddRule(checkout_host, "127.0.0.1");
+  host_resolver()->AddRule(kAppHost, "127.0.0.1");
+  host_resolver()->AddRule(kNonAppHost, "127.0.0.1");
+  host_resolver()->AddRule(kCheckoutHost, "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   GURL test_file_url(test_server()->GetURL(
       "files/extensions/get_app_details_for_frame.html"));
   GURL::Replacements replace_host;
 
-  replace_host.SetHostStr(checkout_host);
+  replace_host.SetHostStr(kCheckoutHost);
   GURL checkout_url(test_file_url.ReplaceComponents(replace_host));
 
-  replace_host.SetHostStr(app_host);
+  replace_host.SetHostStr(kAppHost);
   GURL app_url(test_file_url.ReplaceComponents(replace_host));
 
   // Load an app which includes app.com in its extent.
   const Extension* extension = LoadExtension(
       test_data_dir_.AppendASCII("app_dot_com_app"));
   ASSERT_TRUE(extension);
 
   // Test that normal pages (even apps) cannot use getDetailsForFrame().
   ui_test_utils::NavigateToURL(browser(), app_url);
   const char kTestUnsuccessfulAccess[] =
@@ skipping 22 matching lines @@
   scoped_ptr<base::DictionaryValue> app_details(
       static_cast<base::DictionaryValue*>(base::JSONReader::Read(json)));
   // extension->manifest() does not contain the id.
   app_details->Remove("id", NULL);
   EXPECT_TRUE(app_details.get());
   EXPECT_TRUE(app_details->Equals(extension->manifest()->value()));
 }
 
 
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningState) {
-  std::string app_host("app.com");
-  std::string non_app_host("nonapp.com");
+  static const char kAppHost[] = "app.com";
+  static const char kNonAppHost[] = "nonapp.com";
 
-  host_resolver()->AddRule(app_host, "127.0.0.1");
-  host_resolver()->AddRule(non_app_host, "127.0.0.1");
+  host_resolver()->AddRule(kAppHost, "127.0.0.1");
+  host_resolver()->AddRule(kNonAppHost, "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   GURL test_file_url(test_server()->GetURL(
       "files/extensions/get_app_details_for_frame.html"));
   GURL::Replacements replace_host;
 
-  replace_host.SetHostStr(app_host);
+  replace_host.SetHostStr(kAppHost);
   GURL app_url(test_file_url.ReplaceComponents(replace_host));
 
-  replace_host.SetHostStr(non_app_host);
+  replace_host.SetHostStr(kNonAppHost);
   GURL non_app_url(test_file_url.ReplaceComponents(replace_host));
 
   // Before the app is installed, app.com does not think that it is installed
   ui_test_utils::NavigateToURL(browser(), app_url);
 
   EXPECT_EQ("not_installed", InstallStateInMainFrame());
   EXPECT_EQ("cannot_run", RunningStateInMainFrame());
   EXPECT_FALSE(IsAppInstalledInMainFrame());
 
   const Extension* extension = LoadExtension(
@@ skipping 32 matching lines @@
   EXPECT_EQ("not_installed", InstallStateInMainFrame());
   EXPECT_EQ("cannot_run", RunningStateInMainFrame());
   EXPECT_FALSE(IsAppInstalledInMainFrame());
 
   EXPECT_EQ("installed", InstallStateInIFrame());
   EXPECT_EQ("cannot_run", RunningStateInIFrame());
   EXPECT_FALSE(IsAppInstalledInIFrame());
 }
 
 IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, InstallAndRunningStateFrame) {
-  std::string app_host("app.com");
-  std::string non_app_host("nonapp.com");
+  static const char kAppHost[] = "app.com";
+  static const char kNonAppHost[] = "nonapp.com";
 
-  host_resolver()->AddRule(app_host, "127.0.0.1");
-  host_resolver()->AddRule(non_app_host, "127.0.0.1");
+  host_resolver()->AddRule(kAppHost, "127.0.0.1");
+  host_resolver()->AddRule(kNonAppHost, "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   GURL test_file_url(test_server()->GetURL(
       "files/extensions/get_app_details_for_frame_reversed.html"));
   GURL::Replacements replace_host;
 
-  replace_host.SetHostStr(app_host);
+  replace_host.SetHostStr(kAppHost);
   GURL app_url(test_file_url.ReplaceComponents(replace_host));
 
-  replace_host.SetHostStr(non_app_host);
+  replace_host.SetHostStr(kNonAppHost);
   GURL non_app_url(test_file_url.ReplaceComponents(replace_host));
 
   // Check the install and running state of a non-app iframe running
   // within an app.
   ui_test_utils::NavigateToURL(browser(), app_url);
 
   EXPECT_EQ("not_installed", InstallStateInIFrame());
   EXPECT_EQ("cannot_run", RunningStateInIFrame());
   EXPECT_FALSE(IsAppInstalledInIFrame());
 }