1 files changed, 53 insertions, 40 deletions

diff --git a/chrome/browser/devtools/devtools_network_controller_unittest.cc b/chrome/browser/devtools/devtools_network_controller_unittest.cc
index 708b9e1..07bba5e 100644
--- a/chrome/browser/devtools/devtools_network_controller_unittest.cc
+++ b/chrome/browser/devtools/devtools_network_controller_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/run_loop.h"
 #include "chrome/browser/devtools/devtools_network_conditions.h"
 #include "chrome/browser/devtools/devtools_network_controller.h"
+#include "chrome/browser/devtools/devtools_network_interceptor.h"
 #include "chrome/browser/devtools/devtools_network_transaction.h"
 #include "net/http/http_transaction_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -17,9 +18,8 @@
 
 namespace test {
 
-const char kHttpDotCom[] = "http://dot.com";
-const char kHttpDotOrg[] = "http://dot.org";
-const char kCom[] = "com";
+const char kClientId[] = "42";
+const char kAnotherClientId[] = "24";
 
 class TestCallback {
  public:
@@ -44,7 +44,9 @@ class DevToolsNetworkControllerHelper {
       mock_transaction_(kSimpleGET_Transaction),
       buffer_(new net::IOBuffer(64)) {
     mock_transaction_.test_mode = TEST_MODE_SYNC_NET_START;
-    mock_transaction_.url = kHttpDotCom;
+    mock_transaction_.url = "http://dot.com";
+    mock_transaction_.request_headers =
+        "X-DevTools-Emulate-Network-Conditions-Client-Id: 42\r\n";
     AddMockTransaction(&mock_transaction_);
 
     scoped_ptr<net::HttpTransaction> network_transaction;
@@ -60,13 +62,10 @@ class DevToolsNetworkControllerHelper {
     return request_.get();
   }
 
-  void SetNetworkState(bool offline) {
-    std::vector<std::string> domains;
-    domains.push_back(kCom);
-    scoped_refptr<DevToolsNetworkConditions> conditions;
-    if (offline)
-      conditions = new DevToolsNetworkConditions(domains, 0.0);
-    controller_.SetNetworkStateOnIO(conditions);
+  void SetNetworkState(const std::string id, bool offline) {
+    scoped_refptr<DevToolsNetworkConditions> conditions(
+        new DevToolsNetworkConditions(offline));
+    controller_.SetNetworkStateOnIO(id, conditions);
   }
 
   int Start() {
@@ -78,6 +77,10 @@ class DevToolsNetworkControllerHelper {
     return transaction_->Read(buffer_.get(), 64, completion_callback_);
   }
 
+  bool ShouldFail() {
+    return transaction_->interceptor_->ShouldFail(transaction_.get());
+  }
+
   ~DevToolsNetworkControllerHelper() {
     RemoveMockTransaction(&mock_transaction_);
   }
@@ -101,19 +104,37 @@ class DevToolsNetworkControllerHelper {
 
 TEST(DevToolsNetworkControllerTest, SingleDisableEnable) {
   DevToolsNetworkControllerHelper helper;
-  DevToolsNetworkController* controller = helper.controller();
-  net::HttpRequestInfo* request = helper.GetRequest();
-
-  EXPECT_FALSE(controller->ShouldFail(request));
-  helper.SetNetworkState(true);
-  EXPECT_TRUE(controller->ShouldFail(request));
-  helper.SetNetworkState(false);
-  EXPECT_FALSE(controller->ShouldFail(request));
+  helper.SetNetworkState(kClientId, false);
+  helper.Start();
+
+  EXPECT_FALSE(helper.ShouldFail());
+  helper.SetNetworkState(kClientId, true);
+  EXPECT_TRUE(helper.ShouldFail());
+  helper.SetNetworkState(kClientId, false);
+  EXPECT_FALSE(helper.ShouldFail());
+
+  base::RunLoop().RunUntilIdle();
+}
+
+TEST(DevToolsNetworkControllerTest, InterceptorIsolation) {
+  DevToolsNetworkControllerHelper helper;
+  helper.SetNetworkState(kClientId, false);
+  helper.Start();
+
+  EXPECT_FALSE(helper.ShouldFail());
+  helper.SetNetworkState(kAnotherClientId, true);
+  EXPECT_FALSE(helper.ShouldFail());
+  helper.SetNetworkState(kClientId, true);
+  EXPECT_TRUE(helper.ShouldFail());
+
+  helper.SetNetworkState(kAnotherClientId, false);
+  helper.SetNetworkState(kClientId, false);
+  base::RunLoop().RunUntilIdle();
 }
 
 TEST(DevToolsNetworkControllerTest, FailOnStart) {
   DevToolsNetworkControllerHelper helper;
-  helper.SetNetworkState(true);
+  helper.SetNetworkState(kClientId, true);
 
   int rv = helper.Start();
   EXPECT_EQ(rv, net::ERR_INTERNET_DISCONNECTED);
@@ -124,6 +145,7 @@ TEST(DevToolsNetworkControllerTest, FailOnStart) {
 
 TEST(DevToolsNetworkControllerTest, FailRunningTransaction) {
   DevToolsNetworkControllerHelper helper;
+  helper.SetNetworkState(kClientId, false);
   TestCallback* callback = helper.callback();
 
   int rv = helper.Start();
@@ -134,7 +156,7 @@ TEST(DevToolsNetworkControllerTest, FailRunningTransaction) {
   EXPECT_EQ(rv, net::ERR_IO_PENDING);
   EXPECT_EQ(callback->run_count(), 0);
 
-  helper.SetNetworkState(true);
+  helper.SetNetworkState(kClientId, true);
   EXPECT_EQ(callback->run_count(), 1);
   EXPECT_EQ(callback->value(), net::ERR_INTERNET_DISCONNECTED);
 
@@ -145,19 +167,20 @@ TEST(DevToolsNetworkControllerTest, FailRunningTransaction) {
   EXPECT_EQ(callback->run_count(), 1);
 
   // Check that transaction in not failed second time.
-  helper.SetNetworkState(false);
-  helper.SetNetworkState(true);
+  helper.SetNetworkState(kClientId, false);
+  helper.SetNetworkState(kClientId, true);
   EXPECT_EQ(callback->run_count(), 1);
 }
 
 TEST(DevToolsNetworkControllerTest, ReadAfterFail) {
   DevToolsNetworkControllerHelper helper;
+  helper.SetNetworkState(kClientId, false);
 
   int rv = helper.Start();
   EXPECT_EQ(rv, net::OK);
   EXPECT_TRUE(helper.transaction()->request());
 
-  helper.SetNetworkState(true);
+  helper.SetNetworkState(kClientId, true);
   EXPECT_TRUE(helper.transaction()->failed());
 
   scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(64));
@@ -171,25 +194,15 @@ TEST(DevToolsNetworkControllerTest, ReadAfterFail) {
 
 TEST(DevToolsNetworkControllerTest, AllowsDevToolsRequests) {
   DevToolsNetworkControllerHelper helper;
+  helper.SetNetworkState(kClientId, false);
   helper.mock_transaction()->request_headers =
+      "X-DevTools-Emulate-Network-Conditions-Client-Id: 42\r\n"
       "X-DevTools-Request-Initiator: frontend\r\n";
-  DevToolsNetworkController* controller = helper.controller();
-  net::HttpRequestInfo* request = helper.GetRequest();
-
-  EXPECT_FALSE(controller->ShouldFail(request));
-  helper.SetNetworkState(true);
-  EXPECT_FALSE(controller->ShouldFail(request));
-}
-
-TEST(DevToolsNetworkControllerTest, AllowsNotMatchingRequests) {
-  DevToolsNetworkControllerHelper helper;
-  helper.mock_transaction()->url = kHttpDotOrg;
-  DevToolsNetworkController* controller = helper.controller();
-  net::HttpRequestInfo* request = helper.GetRequest();
+  helper.Start();
 
-  EXPECT_FALSE(controller->ShouldFail(request));
-  helper.SetNetworkState(true);
-  EXPECT_FALSE(controller->ShouldFail(request));
+  EXPECT_FALSE(helper.ShouldFail());
+  helper.SetNetworkState(kClientId, true);
+  EXPECT_FALSE(helper.ShouldFail());
 }
 
 }  // namespace test