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

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

Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi... (Closed)
Patch Set: ready for review Created 3 years, 7 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
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/testing_profile.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/javascript_browser_test.h" 5 #include "chrome/test/base/javascript_browser_test.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/threading/thread_restrictions.h"
10 #include "chrome/common/chrome_paths.h" 11 #include "chrome/common/chrome_paths.h"
11 #include "content/public/browser/web_ui.h" 12 #include "content/public/browser/web_ui.h"
12 #include "ui/base/resource/resource_bundle.h" 13 #include "ui/base/resource/resource_bundle.h"
13 14
14 // static 15 // static
15 const base::FilePath::CharType 16 const base::FilePath::CharType
16 JavaScriptBrowserTest::kA11yAuditLibraryJSPath[] = 17 JavaScriptBrowserTest::kA11yAuditLibraryJSPath[] =
17 FILE_PATH_LITERAL("third_party/accessibility-audit/axs_testing.js"); 18 FILE_PATH_LITERAL("third_party/accessibility-audit/axs_testing.js");
18 19
19 // static 20 // static
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 60
60 AddLibrary(base::FilePath(kMockJSPath)); 61 AddLibrary(base::FilePath(kMockJSPath));
61 AddLibrary(base::FilePath(kChaiJSPath)); 62 AddLibrary(base::FilePath(kChaiJSPath));
62 AddLibrary(base::FilePath(kWebUILibraryJS)); 63 AddLibrary(base::FilePath(kWebUILibraryJS));
63 } 64 }
64 65
65 // TODO(dtseng): Make this return bool (success/failure) and remove ASSERt_TRUE 66 // TODO(dtseng): Make this return bool (success/failure) and remove ASSERt_TRUE
66 // calls. 67 // calls.
67 void JavaScriptBrowserTest::BuildJavascriptLibraries( 68 void JavaScriptBrowserTest::BuildJavascriptLibraries(
68 std::vector<base::string16>* libraries) { 69 std::vector<base::string16>* libraries) {
70 base::ThreadRestrictions::ScopedAllowIO allow_io;
69 ASSERT_TRUE(libraries != NULL); 71 ASSERT_TRUE(libraries != NULL);
70 std::vector<base::FilePath>::iterator user_libraries_iterator; 72 std::vector<base::FilePath>::iterator user_libraries_iterator;
71 for (user_libraries_iterator = user_libraries_.begin(); 73 for (user_libraries_iterator = user_libraries_.begin();
72 user_libraries_iterator != user_libraries_.end(); 74 user_libraries_iterator != user_libraries_.end();
73 ++user_libraries_iterator) { 75 ++user_libraries_iterator) {
74 std::string library_content; 76 std::string library_content;
75 if (user_libraries_iterator->IsAbsolute()) { 77 if (user_libraries_iterator->IsAbsolute()) {
76 ASSERT_TRUE( 78 ASSERT_TRUE(
77 base::ReadFileToString(*user_libraries_iterator, &library_content)) 79 base::ReadFileToString(*user_libraries_iterator, &library_content))
78 << user_libraries_iterator->value(); 80 << user_libraries_iterator->value();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 for (const auto& arg : test_func_args) 115 for (const auto& arg : test_func_args)
114 baked_argument_list->Append(arg.CreateDeepCopy()); 116 baked_argument_list->Append(arg.CreateDeepCopy());
115 arguments.push_back(std::move(baked_argument_list)); 117 arguments.push_back(std::move(baked_argument_list));
116 118
117 std::vector<const base::Value*> ptr_vector; 119 std::vector<const base::Value*> ptr_vector;
118 ptr_vector.reserve(arguments.size()); 120 ptr_vector.reserve(arguments.size());
119 for (const auto& argument : arguments) 121 for (const auto& argument : arguments)
120 ptr_vector.push_back(argument.get()); 122 ptr_vector.push_back(argument.get());
121 return content::WebUI::GetJavascriptCall(std::string("runTest"), ptr_vector); 123 return content::WebUI::GetJavascriptCall(std::string("runTest"), ptr_vector);
122 } 124 }
OLDNEW
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698