Stop using the default profile's proxy service for plugin proxy requests, and instead use the associated profile's proxy service. I proxy the IPC through the renderer first, as that makes it easy to get to the associated profile.

BUG=92361,64339
Review URL: http://codereview.chromium.org/7791005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98728 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 16 deletions

diff --git a/content/browser/resolve_proxy_msg_helper_unittest.cc b/content/browser/resolve_proxy_msg_helper_unittest.cc
index 346796c..91f35c1 100644
--- a/content/browser/resolve_proxy_msg_helper_unittest.cc
+++ b/content/browser/resolve_proxy_msg_helper_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/resolve_proxy_msg_helper.h"
 
-#include "content/common/child_process_messages.h"
+#include "content/common/view_messages.h"
 #include "ipc/ipc_test_sink.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/mock_proxy_resolver.h"
@@ -27,12 +27,12 @@ class ResolveProxyMsgHelperTest : public testing::Test,
                                   public IPC::Channel::Listener {
  public:
   struct PendingResult {
-    PendingResult(int error_code,
+    PendingResult(bool result,
                   const std::string& proxy_list)
-        : error_code(error_code), proxy_list(proxy_list) {
+        : result(result), proxy_list(proxy_list) {
     }
 
-    int error_code;
+    bool result;
     std::string proxy_list;
   };
 
@@ -55,9 +55,9 @@ class ResolveProxyMsgHelperTest : public testing::Test,
   }
 
   IPC::Message* GenerateReply() {
-    int temp_int;
+    bool temp_bool;
     std::string temp_string;
-    ChildProcessHostMsg_ResolveProxy message(GURL(), &temp_int, &temp_string);
+    ViewHostMsg_ResolveProxy message(GURL(), &temp_bool, &temp_string);
     return IPC::SyncMessage::GenerateReply(&message);
   }
 
@@ -68,10 +68,8 @@ class ResolveProxyMsgHelperTest : public testing::Test,
 
  private:
   virtual bool OnMessageReceived(const IPC::Message& msg) {
-    TupleTypes<ChildProcessHostMsg_ResolveProxy::ReplyParam>::ValueTuple
-        reply_data;
-    EXPECT_TRUE(
-        ChildProcessHostMsg_ResolveProxy::ReadReplyParam(&msg, &reply_data));
+    TupleTypes<ViewHostMsg_ResolveProxy::ReplyParam>::ValueTuple reply_data;
+    EXPECT_TRUE(ViewHostMsg_ResolveProxy::ReadReplyParam(&msg, &reply_data));
     DCHECK(!pending_result_.get());
     pending_result_.reset(new PendingResult(reply_data.a, reply_data.b));
     test_sink_.ClearMessages();
@@ -108,7 +106,7 @@ TEST_F(ResolveProxyMsgHelperTest, Sequential) {
   resolver_->pending_requests()[0]->CompleteNow(net::OK);
 
   // Check result.
-  EXPECT_EQ(net::OK, pending_result()->error_code);
+  EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result1:80", pending_result()->proxy_list);
   clear_pending_result();
 
@@ -120,7 +118,7 @@ TEST_F(ResolveProxyMsgHelperTest, Sequential) {
   resolver_->pending_requests()[0]->CompleteNow(net::OK);
 
   // Check result.
-  EXPECT_EQ(net::OK, pending_result()->error_code);
+  EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result2:80", pending_result()->proxy_list);
   clear_pending_result();
 
@@ -132,7 +130,7 @@ TEST_F(ResolveProxyMsgHelperTest, Sequential) {
   resolver_->pending_requests()[0]->CompleteNow(net::OK);
 
   // Check result.
-  EXPECT_EQ(net::OK, pending_result()->error_code);
+  EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result3:80", pending_result()->proxy_list);
   clear_pending_result();
 }
@@ -167,7 +165,7 @@ TEST_F(ResolveProxyMsgHelperTest, QueueRequests) {
   resolver_->pending_requests()[0]->CompleteNow(net::OK);
 
   // Check result.
-  EXPECT_EQ(net::OK, pending_result()->error_code);
+  EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result1:80", pending_result()->proxy_list);
   clear_pending_result();
 
@@ -178,7 +176,7 @@ TEST_F(ResolveProxyMsgHelperTest, QueueRequests) {
   resolver_->pending_requests()[0]->CompleteNow(net::OK);
 
   // Check result.
-  EXPECT_EQ(net::OK, pending_result()->error_code);
+  EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result2:80", pending_result()->proxy_list);
   clear_pending_result();
 
@@ -189,7 +187,7 @@ TEST_F(ResolveProxyMsgHelperTest, QueueRequests) {
   resolver_->pending_requests()[0]->CompleteNow(net::OK);
 
   // Check result.
-  EXPECT_EQ(net::OK, pending_result()->error_code);
+  EXPECT_EQ(true, pending_result()->result);
   EXPECT_EQ("PROXY result3:80", pending_result()->proxy_list);
   clear_pending_result();
 }