diff options
Diffstat (limited to 'chrome/browser/translate')
| -rw-r--r-- | chrome/browser/translate/translate_manager.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/translate/translate_manager.h | 2 | ||||
| -rw-r--r-- | chrome/browser/translate/translate_manager_browsertest.cc | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 3322ca02..98e7f20 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -295,7 +295,7 @@ void TranslateManager::OnURLFetchComplete(const URLFetcher* source, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { scoped_ptr<const URLFetcher> delete_ptr(source); DCHECK(translate_script_request_pending_); diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h index 18c0f6f..5690321 100644 --- a/chrome/browser/translate/translate_manager.h +++ b/chrome/browser/translate/translate_manager.h @@ -68,7 +68,7 @@ class TranslateManager : public NotificationObserver, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Used by unit-tests to override the default delay after which the translate diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index ff01361..a5103f3 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -7,16 +7,16 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_change_registrar.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/translate/translate_manager.h" #include "chrome/browser/translate/translate_prefs.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" +#include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" -#include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" @@ -32,8 +32,8 @@ #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" -#include "third_party/cld/languages/public/languages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/cld/languages/public/languages.h" using testing::_; using testing::Pointee; @@ -183,7 +183,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness, net::URLRequestStatus::FAILED); fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(), status, success ? 200 : 500, - ResponseCookies(), + net::ResponseCookies(), std::string()); } |
