summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autofill
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/autofill')
-rw-r--r--chrome/browser/autofill/autofill_browsertest.cc9
-rw-r--r--chrome/browser/autofill/autofill_download.cc2
-rw-r--r--chrome/browser/autofill/autofill_download.h2
-rw-r--r--chrome/browser/autofill/autofill_download_unittest.cc18
4 files changed, 16 insertions, 15 deletions
diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc
index 9337f39..1414898 100644
--- a/chrome/browser/autofill/autofill_browsertest.cc
+++ b/chrome/browser/autofill/autofill_browsertest.cc
@@ -138,10 +138,11 @@ class AutofillTest : public InProcessBrowserTest {
" };"
"})();";
- fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(),
- status, success ? 200 : 500,
- ResponseCookies(),
- script);
+ fetcher->delegate()->OnURLFetchComplete(fetcher,
+ fetcher->original_url(),
+ status, success ? 200 : 500,
+ net::ResponseCookies(),
+ script);
}
void FocusFirstNameField() {
diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc
index a8ce10e..28ff45ed 100644
--- a/chrome/browser/autofill/autofill_download.cc
+++ b/chrome/browser/autofill/autofill_download.cc
@@ -266,7 +266,7 @@ void AutofillDownloadManager::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
std::map<URLFetcher *, FormRequestData>::iterator it =
url_fetchers_.find(const_cast<URLFetcher*>(source));
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h
index b019495..8607474 100644
--- a/chrome/browser/autofill/autofill_download.h
+++ b/chrome/browser/autofill/autofill_download.h
@@ -138,7 +138,7 @@ class AutofillDownloadManager : public URLFetcher::Delegate {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
// Profile for preference storage.
diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc
index 1261568..9591731 100644
--- a/chrome/browser/autofill/autofill_download_unittest.cc
+++ b/chrome/browser/autofill/autofill_download_unittest.cc
@@ -241,7 +241,7 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
ASSERT_TRUE(fetcher);
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 200, ResponseCookies(),
+ 200, net::ResponseCookies(),
std::string(responses[1]));
// After that upload rates would be adjusted to 0.5/0.3
EXPECT_DOUBLE_EQ(0.5, helper.download_manager.GetPositiveUploadRate());
@@ -251,13 +251,13 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
ASSERT_TRUE(fetcher);
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 404, ResponseCookies(),
+ 404, net::ResponseCookies(),
std::string(responses[2]));
fetcher = factory.GetFetcherByID(0);
ASSERT_TRUE(fetcher);
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 200, ResponseCookies(),
+ 200, net::ResponseCookies(),
std::string(responses[0]));
EXPECT_EQ(static_cast<size_t>(3), helper.responses_.size());
@@ -317,7 +317,7 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms()));
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 500, ResponseCookies(),
+ 500, net::ResponseCookies(),
std::string(responses[0]));
EXPECT_EQ(AutofillDownloadTestHelper::REQUEST_QUERY_FAILED,
helper.responses_.front().type_of_response);
@@ -345,7 +345,7 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) {
base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms()));
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 503, ResponseCookies(),
+ 503, net::ResponseCookies(),
std::string(responses[2]));
EXPECT_EQ(AutofillDownloadTestHelper::REQUEST_UPLOAD_FAILED,
helper.responses_.front().type_of_response);
@@ -453,7 +453,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) {
ASSERT_TRUE(fetcher);
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 200, ResponseCookies(),
+ 200, net::ResponseCookies(),
std::string(responses[0]));
ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size());
EXPECT_EQ(responses[0], helper.responses_.front().response);
@@ -482,7 +482,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) {
ASSERT_TRUE(fetcher);
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 200, ResponseCookies(),
+ 200, net::ResponseCookies(),
std::string(responses[1]));
ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size());
EXPECT_EQ(responses[1], helper.responses_.front().response);
@@ -499,7 +499,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) {
ASSERT_TRUE(fetcher);
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 200, ResponseCookies(),
+ 200, net::ResponseCookies(),
std::string(responses[2]));
ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size());
EXPECT_EQ(responses[2], helper.responses_.front().response);
@@ -535,7 +535,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) {
ASSERT_TRUE(fetcher);
fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(),
net::URLRequestStatus(),
- 200, ResponseCookies(),
+ 200, net::ResponseCookies(),
std::string(responses[0]));
ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size());
EXPECT_EQ(responses[0], helper.responses_.front().response);