summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-12-15 18:11:11 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-16 02:11:53 +0000
commit8ac4d17f615f5d2060cdbb6334ad39da72f9a9a3 (patch)
tree1a728ba832511ec3bd923a0585bb9c742d4cf56e
parent005afed80274bf93a2ddc853c64baf3875367e7b (diff)
downloadchromium_src-8ac4d17f615f5d2060cdbb6334ad39da72f9a9a3.zip
chromium_src-8ac4d17f615f5d2060cdbb6334ad39da72f9a9a3.tar.gz
chromium_src-8ac4d17f615f5d2060cdbb6334ad39da72f9a9a3.tar.bz2
net: fix more gn check errors for //net/*
Tested on Linux with the following command lines: $ gn gen out-gn/Release --args='is_debug=false is_component_build=false symbol_level=1' $ gn check out-gn/Release //net/* BUG=367595,376000 R=eroman@chromium.org,brettw@chromium.org Review URL: https://codereview.chromium.org/1523553002 Cr-Commit-Position: refs/heads/master@{#365410}
-rw-r--r--net/BUILD.gn6
-rw-r--r--net/tools/flip_server/spdy_interface_test.cc6
2 files changed, 10 insertions, 2 deletions
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 7403fe2..c5dfe54 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -787,7 +787,7 @@ if (use_v8_in_net && !is_android) {
public_deps = [
":mojo_type_converters",
- ":net",
+ ":net_with_v8",
"//base",
"//mojo/common",
"//mojo/public/cpp/bindings",
@@ -811,6 +811,7 @@ if (use_v8_in_net && !is_android) {
public_deps = [
":net",
+ "//base",
"//mojo/public/cpp/bindings",
"//net/interfaces",
]
@@ -829,6 +830,7 @@ if (use_v8_in_net && !is_android) {
deps = [
":net_with_v8",
+ "//base",
]
public_deps = [
@@ -1148,6 +1150,7 @@ if (is_linux) {
":balsa",
":epoll_server",
":net",
+ ":simple_quic_tools",
"//base",
"//base/third_party/dynamic_annotations",
"//crypto",
@@ -1261,6 +1264,7 @@ source_set("simple_quic_tools") {
"tools/quic/synchronous_host_resolver.h",
]
deps = [
+ ":balsa",
":net",
"//base",
"//base/third_party/dynamic_annotations",
diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc
index 1732426..afea0c4 100644
--- a/net/tools/flip_server/spdy_interface_test.cc
+++ b/net/tools/flip_server/spdy_interface_test.cc
@@ -9,7 +9,6 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_piece.h"
#include "net/spdy/buffered_spdy_framer.h"
-#include "net/spdy/spdy_test_utils.h"
#include "net/tools/balsa/balsa_enums.h"
#include "net/tools/balsa/balsa_headers.h"
#include "net/tools/flip_server/flip_config.h"
@@ -28,6 +27,11 @@ using ::testing::Return;
using ::testing::SaveArg;
using ::testing::Values;
+inline bool operator==(StringPiece x,
+ const SpdyHeaderBlock::StringPieceProxy& y) {
+ return x == y.operator StringPiece();
+}
+
namespace {
struct StringSaver {