Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1145)

Side by Side Diff: webkit/glue/resource_fetcher_unittest.cc

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/glue/resource_fetcher.cc ('k') | webkit/glue/simple_webmimeregistry_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #if defined(OS_LINUX) 5 #if defined(OS_LINUX)
6 #include <gtk/gtk.h> 6 #include <gtk/gtk.h>
7 #endif 7 #endif
8 8
9 #include "webkit/api/public/WebFrame.h" 9 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
10 #include "webkit/api/public/WebURLResponse.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
11 #include "webkit/api/public/WebView.h" 11 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
12 #include "webkit/glue/unittest_test_server.h" 12 #include "webkit/glue/unittest_test_server.h"
13 #include "webkit/glue/resource_fetcher.h" 13 #include "webkit/glue/resource_fetcher.h"
14 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" 14 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
15 #include "webkit/tools/test_shell/test_shell_test.h" 15 #include "webkit/tools/test_shell/test_shell_test.h"
16 16
17 using WebKit::WebFrame; 17 using WebKit::WebFrame;
18 using WebKit::WebURLResponse; 18 using WebKit::WebURLResponse;
19 using webkit_glue::ResourceFetcher; 19 using webkit_glue::ResourceFetcher;
20 using webkit_glue::ResourceFetcherWithTimeout; 20 using webkit_glue::ResourceFetcherWithTimeout;
21 21
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 223
224 // When we timeout, we still call the Delegate callback but we pass in empty 224 // When we timeout, we still call the Delegate callback but we pass in empty
225 // values. 225 // values.
226 EXPECT_TRUE(delegate->completed()); 226 EXPECT_TRUE(delegate->completed());
227 EXPECT_TRUE(delegate->response().isNull()); 227 EXPECT_TRUE(delegate->response().isNull());
228 EXPECT_EQ(delegate->data(), std::string()); 228 EXPECT_EQ(delegate->data(), std::string());
229 EXPECT_TRUE(delegate->time_elapsed_ms() < kMaxWaitTimeMs); 229 EXPECT_TRUE(delegate->time_elapsed_ms() < kMaxWaitTimeMs);
230 } 230 }
231 231
232 } // namespace 232 } // namespace
OLDNEW
« no previous file with comments | « webkit/glue/resource_fetcher.cc ('k') | webkit/glue/simple_webmimeregistry_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698