Change WebURLLoaderMockFactory for future FOUC tests in blink.

content/test/weburl_loader_mock_factory.cc

 // Copyright 2013 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 "content/test/weburl_loader_mock_factory.h"
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "content/test/weburl_loader_mock.h"
@@ skipping 90 matching lines @@
     pending_loaders_.erase(loader);
   }
   base::RunLoop().RunUntilIdle();
 }
 
 bool WebURLLoaderMockFactory::IsMockedURL(const blink::WebURL& url) {
   return url_to_reponse_info_.find(url) != url_to_reponse_info_.end();
 }
 
 void WebURLLoaderMockFactory::CancelLoad(WebURLLoaderMock* loader) {
   LoaderToRequestMap::iterator iter = pending_loaders_.find(loader);

[dcheng, 2015/08/26 15:38:18]

How about just replacing the entire body with pending_loaders_.erase(loader);

[esprehn, 2015/08/26 16:01:40]

Done.

-  DCHECK(iter != pending_loaders_.end());
+  if (iter == pending_loaders_.end())
+    return;
   pending_loaders_.erase(iter);
 }
 
 WebURLLoader* WebURLLoaderMockFactory::CreateURLLoader(
     WebURLLoader* default_loader) {
   DCHECK(default_loader);
   return new WebURLLoaderMock(this, default_loader);
 }
 
 void WebURLLoaderMockFactory::LoadSynchronously(const WebURLRequest& request,
@@ skipping 36 matching lines @@
 }
 
 bool WebURLLoaderMockFactory::IsPending(WebURLLoaderMock* loader) {
   LoaderToRequestMap::iterator iter = pending_loaders_.find(loader);
   return iter != pending_loaders_.end();
 }
 
 // static
 bool WebURLLoaderMockFactory::ReadFile(const base::FilePath& file_path,
                                        WebData* data) {
+  if (file_path.empty())
+    return true;
+
   int64 file_size = 0;
   if (!base::GetFileSize(file_path, &file_size))
     return false;
 
   int size = static_cast<int>(file_size);
   scoped_ptr<char[]> buffer(new char[size]);
   data->reset();
   int read_count = base::ReadFile(file_path, buffer.get(), size);
   if (read_count == -1)
     return false;
   DCHECK(read_count == size);
   data->assign(buffer.get(), size);
 
   return true;
 }