commit a3f29a09cdbbe7c56f63d179d58898dd7364d37a
author kjellander <kjellander@webrtc.org> Mon Jan 04 18:15:53 2016
committer Commit bot <commit-bot@chromium.org> Mon Jan 04 18:16:01 2016
tree f4f70c0e5299fbe54fde37854d43ee600bc96d35
parent c9181c58865eb33cca0117aa48f1b3b20721785c

Roll chromium_revision d66326c..4df108a (367167:367307)

The changes in https://chromium.googlesource.com/chromium/src/+/d66326c..4df108a/build/common.gypi
enables a lot more warnings, which have been disabled/fixed in this CL.
See tracking bugs for remaining work.

Change log: https://chromium.googlesource.com/chromium/src/+log/d66326c..4df108a
Full diff: https://chromium.googlesource.com/chromium/src/+/d66326c..4df108a

Changed dependencies:
* src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/fee7f1e..6d0c448
* src/third_party/libsrtp: https://chromium.googlesource.com/chromium/deps/libsrtp.git/+log/b8dd754..8a7662a
DEPS diff: https://chromium.googlesource.com/chromium/src/+/d66326c..4df108a/DEPS

No update to Clang.

BUG=webrtc:5397, webrtc:5398, webrtc:5399
TBR=hta@webrtc.org, perkj@webrtc.org
NOTRY=True

Review URL: https://codereview.webrtc.org/1553033002

Cr-Original-Commit-Position: refs/heads/master@{#11147}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 60ca31bf5d206ff01b5441639806f7303365e162

base/latebindingsymboltable_unittest.cc

diff --git a/base/latebindingsymboltable_unittest.cc b/base/latebindingsymboltable_unittest.cc
index 30ebd17..0079f20 100644
--- a/base/latebindingsymboltable_unittest.cc
+++ b/base/latebindingsymboltable_unittest.cc
@@ -21,9 +21,10 @@
 
 #define LIBM_SYMBOLS_CLASS_NAME LibmTestSymbolTable
 #define LIBM_SYMBOLS_LIST \
-  X(acos) \
-  X(sin) \
-  X(tan)
+  X(acosf) \
+  X(sinf) \
+  X(tanf)
+
 
 #define LATE_BINDING_SYMBOL_TABLE_CLASS_NAME LIBM_SYMBOLS_CLASS_NAME
 #define LATE_BINDING_SYMBOL_TABLE_SYMBOLS_LIST LIBM_SYMBOLS_LIST
@@ -39,9 +40,9 @@
   EXPECT_FALSE(table.IsLoaded());
   ASSERT_TRUE(table.Load());
   EXPECT_TRUE(table.IsLoaded());
-  EXPECT_EQ(table.acos()(0.5), acos(0.5));
-  EXPECT_EQ(table.sin()(0.5), sin(0.5));
-  EXPECT_EQ(table.tan()(0.5), tan(0.5));
+  EXPECT_EQ(table.acosf()(0.5f), acosf(0.5f));
+  EXPECT_EQ(table.sinf()(0.5f), sinf(0.5f));
+  EXPECT_EQ(table.tanf()(0.5f), tanf(0.5f));
   // It would be nice to check that the addresses are the same, but the nature
   // of dynamic linking and relocation makes them actually be different.
   table.Unload();

base/linux.cc

diff --git a/base/linux.cc b/base/linux.cc
index 1586b27..0894d39 100644
--- a/base/linux.cc
+++ b/base/linux.cc
@@ -233,33 +233,6 @@
   return true;
 }
 
-#if !defined(WEBRTC_CHROMIUM_BUILD)
-static bool ExpectLineFromStream(FileStream* stream,
-                                 std::string* out) {
-  StreamResult res = stream->ReadLine(out);
-  if (res != SR_SUCCESS) {
-    if (res != SR_EOS) {
-      LOG(LS_ERROR) << "Error when reading from stream";
-    } else {
-      LOG(LS_ERROR) << "Incorrect number of lines in stream";
-    }
-    return false;
-  }
-  return true;
-}
-
-static void ExpectEofFromStream(FileStream* stream) {
-  std::string unused;
-  StreamResult res = stream->ReadLine(&unused);
-  if (res == SR_SUCCESS) {
-    LOG(LS_WARNING) << "Ignoring unexpected extra lines from stream";
-  } else if (res != SR_EOS) {
-    LOG(LS_WARNING) << "Error when checking for extra lines from stream";
-  }
-}
-
-#endif
-
 std::string ReadLinuxUname() {
   struct utsname buf;
   if (uname(&buf) < 0) {