summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile_resetter
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-30 09:21:41 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-30 09:21:41 +0000
commitea845f5f6c2d322ac7be14a66ce38a852d755e11 (patch)
treecfb6abad45a75dcf689558676de8599535f3ca7b /chrome/browser/profile_resetter
parentbd2d54cb001abada988c146a9c4ffd86f373b8cc (diff)
downloadchromium_src-ea845f5f6c2d322ac7be14a66ce38a852d755e11.zip
chromium_src-ea845f5f6c2d322ac7be14a66ce38a852d755e11.tar.gz
chromium_src-ea845f5f6c2d322ac7be14a66ce38a852d755e11.tar.bz2
Consolidate TestURLFetcherFactory::SetFakeResponse
Remove the std::string version of the function and convert all callers to the GURL version. BUG=None TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/23625015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile_resetter')
-rw-r--r--chrome/browser/profile_resetter/profile_resetter_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
index f72b5f7..45db01f 100644
--- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
+++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
@@ -29,6 +29,7 @@
#include "extensions/common/manifest_constants.h"
#include "net/http/http_response_headers.h"
#include "net/url_request/test_url_fetcher_factory.h"
+#include "url/gurl.h"
namespace {
@@ -649,7 +650,7 @@ TEST_F(ProfileResetterTest, ResetFewFlags) {
// Tries to load unavailable config file.
TEST_F(ConfigParserTest, NoConnectivity) {
- const std::string url("http://test");
+ const GURL url("http://test");
factory().SetFakeResponse(url, "", false);
scoped_ptr<BrandcodeConfigFetcher> fetcher = WaitForRequest(GURL(url));
@@ -658,7 +659,7 @@ TEST_F(ConfigParserTest, NoConnectivity) {
// Tries to load available config file.
TEST_F(ConfigParserTest, ParseConfig) {
- const std::string url("http://test");
+ const GURL url("http://test");
std::string xml_config(kXmlConfig);
ReplaceString(&xml_config, "placeholder_for_data", kDistributionConfig);
ReplaceString(&xml_config,