Add more ResourceLoaderTests

content/browser/loader/test_resource_handler.cc

Index: content/browser/loader/test_resource_handler.cc
diff --git a/content/browser/loader/test_resource_handler.cc b/content/browser/loader/test_resource_handler.cc
index f01092c517730ff7056c4c00b661fcdc75995231..902d4b30de105967fd957c8d5ca362dcae49994e 100644
--- a/content/browser/loader/test_resource_handler.cc
+++ b/content/browser/loader/test_resource_handler.cc
@@ -11,6 +11,28 @@
 
 namespace content {
 
+namespace {
+
+class ScopedCallDepthTracker {
+ public:
+  explicit ScopedCallDepthTracker(int* call_depth) : call_depth_(call_depth) {
+    EXPECT_EQ(0, *call_depth_);
+    call_depth_[0]++;

[Randy Smith (Not in Mondays), 2016/12/08 22:15:09]

nit, suggestion: I find this a weird syntax for something that isn't generally
an array (and certainly isn't an array from the perspective of these routines).
| (*call_depth_)++|?

[mmenke, 2016/12/08 22:46:37]

Works for me (I mostly like the [0] because, like ->, you see the name first,
and then what you're doing with it, but your view probably makes more sense)

+  }
+
+  ~ScopedCallDepthTracker() {
+    EXPECT_EQ(1, *call_depth_);
+    call_depth_[0]--;
+  }
+
+ private:
+  int* const call_depth_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedCallDepthTracker);
+};
+
+}  // namespace
+
 TestResourceHandler::TestResourceHandler(net::URLRequestStatus* request_status,
                                          std::string* body)
     : ResourceHandler(nullptr),
@@ -37,6 +59,8 @@ bool TestResourceHandler::OnRequestRedirected(
   EXPECT_EQ(1, on_will_start_called_);
   EXPECT_EQ(0, on_response_started_called_);
   EXPECT_EQ(0, on_response_completed_called_);
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
+
   ++on_request_redirected_called_;
 
   if (!on_request_redirected_result_) {
@@ -57,6 +81,8 @@ bool TestResourceHandler::OnResponseStarted(ResourceResponse* response,
   EXPECT_EQ(1, on_will_start_called_);
   EXPECT_EQ(0, on_response_started_called_);
   EXPECT_EQ(0, on_response_completed_called_);
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
+
   ++on_response_started_called_;
 
   EXPECT_FALSE(resource_response_);
@@ -79,6 +105,8 @@ bool TestResourceHandler::OnWillStart(const GURL& url, bool* defer) {
   EXPECT_EQ(0, on_response_started_called_);
   EXPECT_EQ(0, on_will_start_called_);
   EXPECT_EQ(0, on_response_completed_called_);
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
+
   ++on_will_start_called_;
 
   start_url_ = url;
@@ -100,6 +128,8 @@ bool TestResourceHandler::OnWillRead(scoped_refptr<net::IOBuffer>* buf,
   EXPECT_FALSE(canceled_);
   EXPECT_FALSE(expect_on_data_downloaded_);
   EXPECT_EQ(0, on_response_completed_called_);
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
+
   ++on_will_read_called_;
 
   *buf = buffer_;
@@ -117,6 +147,7 @@ bool TestResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
   EXPECT_EQ(1, on_response_started_called_);
   EXPECT_EQ(0, on_response_completed_called_);
   EXPECT_EQ(0, on_read_eof_);
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
 
   ++on_read_completed_called_;
   if (bytes_read == 0)
@@ -147,6 +178,8 @@ bool TestResourceHandler::OnReadCompleted(int bytes_read, bool* defer) {
 void TestResourceHandler::OnResponseCompleted(
     const net::URLRequestStatus& status,
     bool* defer) {
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
+
   EXPECT_EQ(0, on_response_completed_called_);
   if (status.is_success() && !expect_on_data_downloaded_ && expect_eof_read_)
     EXPECT_EQ(1, on_read_eof_);
@@ -170,10 +203,12 @@ void TestResourceHandler::OnDataDownloaded(int bytes_downloaded) {
 }
 
 void TestResourceHandler::Resume() {
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
   controller_->Resume();
 }
 
 void TestResourceHandler::CancelWithError(net::Error net_error) {
+  ScopedCallDepthTracker call_depth_tracker(&call_depth_);
   canceled_ = true;
   controller_->CancelWithError(net_error);
 }