Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / extensions / extension_localization_peer_unittest.cc

diff --git a/src/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/src/chrome/renderer/extensions/extension_localization_peer_unittest.cc
index 94e43b7..38ad056 100644 (file)
--- a/src/chrome/renderer/extensions/extension_localization_peer_unittest.cc
+++ b/src/chrome/renderer/extensions/extension_localization_peer_unittest.cc
@@ -11,6 +11,7 @@
 #include "ipc/ipc_sender.h"
 #include "ipc/ipc_sync_message.h"
 #include "net/base/net_errors.h"
+#include "net/url_request/redirect_info.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -49,15 +50,14 @@ class MockIpcMessageSender : public IPC::Sender {
   DISALLOW_COPY_AND_ASSIGN(MockIpcMessageSender);
 };
 
-class MockResourceLoaderBridgePeer : public content::RequestPeer {
+class MockRequestPeer : public content::RequestPeer {
  public:
-  MockResourceLoaderBridgePeer() {}
-  virtual ~MockResourceLoaderBridgePeer() {}
+  MockRequestPeer() {}
+  virtual ~MockRequestPeer() {}
 
   MOCK_METHOD2(OnUploadProgress, void(uint64 position, uint64 size));
-  MOCK_METHOD3(OnReceivedRedirect,
-               bool(const GURL& new_url,
-                    const GURL& new_first_party_for_cookies,
+  MOCK_METHOD2(OnReceivedRedirect,
+               bool(const net::RedirectInfo& redirect_info,
                     const content::ResourceResponseInfo& info));
   MOCK_METHOD1(OnReceivedResponse,
                void(const content::ResourceResponseInfo& info));
@@ -74,14 +74,14 @@ class MockResourceLoaderBridgePeer : public content::RequestPeer {
       int64_t total_transfer_size));
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(MockResourceLoaderBridgePeer);
+  DISALLOW_COPY_AND_ASSIGN(MockRequestPeer);
 };
 
 class ExtensionLocalizationPeerTest : public testing::Test {
  protected:
   virtual void SetUp() {
     sender_.reset(new MockIpcMessageSender());
-    original_peer_.reset(new MockResourceLoaderBridgePeer());
+    original_peer_.reset(new MockRequestPeer());
     filter_peer_.reset(
         ExtensionLocalizationPeer::CreateExtensionLocalizationPeer(
             original_peer_.get(), sender_.get(), "text/css",
@@ -107,7 +107,7 @@ class ExtensionLocalizationPeerTest : public testing::Test {
   }
 
   scoped_ptr<MockIpcMessageSender> sender_;
-  scoped_ptr<MockResourceLoaderBridgePeer> original_peer_;
+  scoped_ptr<MockRequestPeer> original_peer_;
   scoped_ptr<ExtensionLocalizationPeer> filter_peer_;
 };