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

Side by Side Diff: content/browser/worker_host/test/worker_browsertest.cc

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "base/sys_info.h" 12 #include "base/sys_info.h"
13 #include "base/test/test_timeouts.h" 13 #include "base/test/test_timeouts.h"
14 #include "content/browser/worker_host/worker_process_host.h" 14 #include "content/browser/worker_host/worker_process_host.h"
15 #include "content/browser/worker_host/worker_service_impl.h" 15 #include "content/browser/worker_host/worker_service_impl.h"
16 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
17 #include "content/public/common/content_paths.h" 17 #include "content/public/common/content_paths.h"
18 #include "content/public/test/browser_test_utils.h" 18 #include "content/public/test/browser_test_utils.h"
19 #include "content/public/test/test_utils.h" 19 #include "content/public/test/test_utils.h"
20 #include "content/shell/shell.h" 20 #include "content/shell/shell.h"
21 #include "content/shell/shell_content_browser_client.h" 21 #include "content/shell/shell_content_browser_client.h"
22 #include "content/shell/shell_resource_dispatcher_host_delegate.h" 22 #include "content/shell/shell_resource_dispatcher_host_delegate.h"
23 #include "content/test/content_browser_test.h" 23 #include "content/test/content_browser_test.h"
24 #include "content/test/content_browser_test_utils.h" 24 #include "content/test/content_browser_test_utils.h"
25 #include "googleurl/src/gurl.h"
26 #include "net/base/test_data_directory.h" 25 #include "net/base/test_data_directory.h"
27 #include "net/test/spawned_test_server/spawned_test_server.h" 26 #include "net/test/spawned_test_server/spawned_test_server.h"
27 #include "url/gurl.h"
28 28
29 namespace content { 29 namespace content {
30 30
31 class WorkerTest : public ContentBrowserTest { 31 class WorkerTest : public ContentBrowserTest {
32 public: 32 public:
33 WorkerTest() {} 33 WorkerTest() {}
34 34
35 GURL GetTestURL(const std::string& test_case, const std::string& query) { 35 GURL GetTestURL(const std::string& test_case, const std::string& query) {
36 base::FilePath test_file_path = GetTestFilePath( 36 base::FilePath test_file_path = GetTestFilePath(
37 "workers", test_case.c_str()); 37 "workers", test_case.c_str());
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 // Run test. 279 // Run test.
280 Shell* window = shell(); 280 Shell* window = shell();
281 const string16 expected_title = ASCIIToUTF16("OK"); 281 const string16 expected_title = ASCIIToUTF16("OK");
282 TitleWatcher title_watcher(window->web_contents(), expected_title); 282 TitleWatcher title_watcher(window->web_contents(), expected_title);
283 NavigateToURL(window, url); 283 NavigateToURL(window, url);
284 string16 final_title = title_watcher.WaitAndGetTitle(); 284 string16 final_title = title_watcher.WaitAndGetTitle();
285 EXPECT_EQ(expected_title, final_title); 285 EXPECT_EQ(expected_title, final_title);
286 } 286 }
287 287
288 } // namespace content 288 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/webui/web_ui_controller_factory_registry.cc ('k') | content/browser/worker_host/worker_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698