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

Side by Side Diff: chrome/test/base/web_ui_browsertest.cc

Issue 220253002: Add net/base/filename_util.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « chrome/test/base/ui_test_utils.cc ('k') | chrome/test/gpu/gpu_feature_browsertest.cc » ('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) 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 "chrome/test/base/web_ui_browsertest.h" 5 #include "chrome/test/base/web_ui_browsertest.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 20 matching lines...) Expand all
31 #include "content/public/browser/notification_registrar.h" 31 #include "content/public/browser/notification_registrar.h"
32 #include "content/public/browser/notification_service.h" 32 #include "content/public/browser/notification_service.h"
33 #include "content/public/browser/notification_types.h" 33 #include "content/public/browser/notification_types.h"
34 #include "content/public/browser/url_data_source.h" 34 #include "content/public/browser/url_data_source.h"
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/browser/web_contents_observer.h" 36 #include "content/public/browser/web_contents_observer.h"
37 #include "content/public/browser/web_ui_controller.h" 37 #include "content/public/browser/web_ui_controller.h"
38 #include "content/public/browser/web_ui_message_handler.h" 38 #include "content/public/browser/web_ui_message_handler.h"
39 #include "content/public/test/browser_test_utils.h" 39 #include "content/public/test/browser_test_utils.h"
40 #include "content/public/test/test_navigation_observer.h" 40 #include "content/public/test/test_navigation_observer.h"
41 #include "net/base/net_util.h" 41 #include "net/base/filename_util.h"
42 #include "testing/gmock/include/gmock/gmock.h" 42 #include "testing/gmock/include/gmock/gmock.h"
43 #include "testing/gtest/include/gtest/gtest-spi.h" 43 #include "testing/gtest/include/gtest/gtest-spi.h"
44 #include "ui/base/resource/resource_bundle.h" 44 #include "ui/base/resource/resource_bundle.h"
45 #include "ui/base/resource/resource_handle.h" 45 #include "ui/base/resource/resource_handle.h"
46 46
47 #if defined(ENABLE_FULL_PRINTING) 47 #if defined(ENABLE_FULL_PRINTING)
48 #include "chrome/browser/printing/print_preview_dialog_controller.h" 48 #include "chrome/browser/printing/print_preview_dialog_controller.h"
49 #endif 49 #endif
50 50
51 using content::NavigationController; 51 using content::NavigationController;
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after
789 // testDone directly and expect pass result. 789 // testDone directly and expect pass result.
790 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPassesAsync) { 790 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPassesAsync) {
791 ASSERT_TRUE(RunJavascriptAsyncTest("testDone")); 791 ASSERT_TRUE(RunJavascriptAsyncTest("testDone"));
792 } 792 }
793 793
794 // Test that calling testDone during RunJavascriptTest still completes when 794 // Test that calling testDone during RunJavascriptTest still completes when
795 // waiting for async result. 795 // waiting for async result.
796 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPasses) { 796 IN_PROC_BROWSER_TEST_F(WebUIBrowserAsyncTest, TestTestDoneEarlyPasses) {
797 ASSERT_TRUE(RunJavascriptTest("testDone")); 797 ASSERT_TRUE(RunJavascriptTest("testDone"));
798 } 798 }
OLDNEW
« no previous file with comments | « chrome/test/base/ui_test_utils.cc ('k') | chrome/test/gpu/gpu_feature_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698