Update from chromium https://crrev.com/301725/

net/websockets/websocket_job_test.cc

Index: net/websockets/websocket_job_test.cc
diff --git a/net/websockets/websocket_job_test.cc b/net/websockets/websocket_job_test.cc
index 3faf8093f3719568e28b9b037f2a68c9c2e729a4..c84af8f27cdde452bb4318f70ea411ea987b4ba9 100644
--- a/net/websockets/websocket_job_test.cc
+++ b/net/websockets/websocket_job_test.cc
@@ -228,6 +228,13 @@ class MockCookieStore : public CookieStore {
 
   CookieMonster* GetCookieMonster() override { return NULL; }
 
+  scoped_ptr<CookieStore::CookieChangedSubscription>
+  AddCallbackForCookie(const GURL& url, const std::string& name,
+                       const CookieChangedCallback& callback) override {
+    ADD_FAILURE();
+    return scoped_ptr<CookieChangedSubscription>();
+  }
+
   const std::vector<Entry>& entries() const { return entries_; }
 
  private:
@@ -384,12 +391,12 @@ class WebSocketJobTest : public PlatformTest,
       : spdy_util_(GetParam()),
         enable_websocket_over_spdy_(false) {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     stream_type_ = STREAM_INVALID;
     cookie_store_ = new MockCookieStore;
     context_.reset(new MockURLRequestContext(cookie_store_.get()));
   }
-  virtual void TearDown() override {
+  void TearDown() override {
     cookie_store_ = NULL;
     context_.reset();
     websocket_ = NULL;