| Index: chrome/browser/translate/translate_manager_render_view_host_unittest.cc
|
| diff --git a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
|
| index ec7a7a44bbe228581bfe30c7ffa12b77b434ea92..e5a90db95b6232463a46a70cdf23eee4254fe7f0 100644
|
| --- a/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
|
| +++ b/chrome/browser/translate/translate_manager_render_view_host_unittest.cc
|
| @@ -47,8 +47,10 @@
|
| #include "content/public/common/url_constants.h"
|
| #include "content/public/test/mock_render_process_host.h"
|
| #include "content/public/test/test_renderer_host.h"
|
| +#include "net/base/net_errors.h"
|
| #include "net/url_request/test_url_fetcher_factory.h"
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| +#include "net/url_request/url_request_status.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "third_party/WebKit/public/web/WebContextMenuData.h"
|
| #include "url/gurl.h"
|
| @@ -291,11 +293,9 @@ class TranslateManagerRenderViewHostTest
|
| net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(
|
| translate::TranslateScript::kFetcherId);
|
| ASSERT_TRUE(fetcher);
|
| - net::URLRequestStatus status;
|
| - status.set_status(success ? net::URLRequestStatus::SUCCESS
|
| - : net::URLRequestStatus::FAILED);
|
| + net::Error error = success ? net::OK : net::ERR_FAILED;
|
| fetcher->set_url(fetcher->GetOriginalURL());
|
| - fetcher->set_status(status);
|
| + fetcher->set_status(net::URLRequestStatus::FromError(error));
|
| fetcher->set_response_code(success ? 200 : 500);
|
| fetcher->delegate()->OnURLFetchComplete(fetcher);
|
| }
|
| @@ -305,9 +305,7 @@ class TranslateManagerRenderViewHostTest
|
| const std::vector<std::string>& languages,
|
| bool use_alpha_languages,
|
| const std::vector<std::string>& alpha_languages) {
|
| - net::URLRequestStatus status;
|
| - status.set_status(success ? net::URLRequestStatus::SUCCESS
|
| - : net::URLRequestStatus::FAILED);
|
| + net::Error error = success ? net::OK : net::ERR_FAILED;
|
|
|
| std::string data;
|
| if (success) {
|
| @@ -342,7 +340,7 @@ class TranslateManagerRenderViewHostTest
|
| translate::TranslateLanguageList::kFetcherId);
|
| ASSERT_TRUE(fetcher != NULL);
|
| fetcher->set_url(fetcher->GetOriginalURL());
|
| - fetcher->set_status(status);
|
| + fetcher->set_status(net::URLRequestStatus::FromError(error));
|
| fetcher->set_response_code(success ? 200 : 500);
|
| fetcher->SetResponseString(data);
|
| fetcher->delegate()->OnURLFetchComplete(fetcher);
|
|
|