Fix ShellHTTPAppTest#QueryHandling test.

shell/shell_apptest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 139 matching lines @@
 #else
 #define MAYBE_QueryHandling QueryHandling
 #endif  // ADDRESS_SANITIZER
 TEST_F(ShellHTTPAppTest, MAYBE_QueryHandling) {
   PingablePtr pingable1;
   PingablePtr pingable2;
   application_impl()->ConnectToService(GetURL("app?foo"), &pingable1);
   application_impl()->ConnectToService(GetURL("app?bar"), &pingable2);
 
   int num_responses = 0;
-  auto callback = [this, &num_responses](const String& app_url,
-                                         const String& connection_url,
-                                         const String& message) {
-    EXPECT_EQ(GetURL("app"), app_url);
-    EXPECT_EQ("hello", message);
-    ++num_responses;
-    if (num_responses == 1) {
-      EXPECT_EQ(GetURL("app?foo"), connection_url);
-    } else if (num_responses == 2) {
-      EXPECT_EQ(GetURL("app?bar"), connection_url);
-      base::MessageLoop::current()->Quit();
-    } else {
-      CHECK(false);
-    }
+  auto callbacks_builder = [this, &num_responses](int query_index) {
+    return [this, &num_responses, query_index](const String& app_url,
+                                               const String& connection_url,
+                                               const String& message) {
+      EXPECT_EQ(GetURL("app"), app_url);
+      EXPECT_EQ("hello", message);
+      if (query_index == 1) {
+        EXPECT_EQ(GetURL("app?foo"), connection_url);
+      } else if (query_index == 2) {
+        EXPECT_EQ(GetURL("app?bar"), connection_url);
+      } else {
+        CHECK(false);
+      }
+      ++num_responses;
+      if (num_responses == 2)
+        base::MessageLoop::current()->Quit();
+    };
   };
-  pingable1->Ping("hello", callback);
-  pingable2->Ping("hello", callback);
+  pingable1->Ping("hello", callbacks_builder(1));
+  pingable2->Ping("hello", callbacks_builder(2));
   base::RunLoop().Run();
 }
 
 // mojo: URLs can have querystrings too
 TEST_F(ShellAppTest, MojoURLQueryHandling) {
   PingablePtr pingable;
   application_impl()->ConnectToService("mojo:pingable_app?foo", &pingable);
   auto callback = [this](const String& app_url, const String& connection_url,
                          const String& message) {
     EXPECT_TRUE(EndsWith(app_url, "/pingable_app.mojo", true));
     EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->Quit();
   };
   pingable->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 }  // namespace