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

Side by Side Diff: chrome/browser/extensions/extension_resource_request_policy_apitest.cc

Issue 19579005: Move ReadFileToString to the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/test/base/test_switches.h" 10 #include "chrome/test/base/test_switches.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 ui_test_utils::NavigateToURL(browser(), non_existent_extension); 81 ui_test_utils::NavigateToURL(browser(), non_existent_extension);
82 ASSERT_TRUE(content::ExecuteScriptAndExtractString( 82 ASSERT_TRUE(content::ExecuteScriptAndExtractString(
83 browser()->tab_strip_model()->GetActiveWebContents(), 83 browser()->tab_strip_model()->GetActiveWebContents(),
84 "window.domAutomationController.send(document.title)", 84 "window.domAutomationController.send(document.title)",
85 &result)); 85 &result));
86 EXPECT_EQ(result, "Image failed to load"); 86 EXPECT_EQ(result, "Image failed to load");
87 87
88 // A data URL. Data URLs should always be able to load chrome-extension:// 88 // A data URL. Data URLs should always be able to load chrome-extension://
89 // resources. 89 // resources.
90 std::string file_source; 90 std::string file_source;
91 ASSERT_TRUE(file_util::ReadFileToString( 91 ASSERT_TRUE(base::ReadFileToString(
92 test_data_dir_.AppendASCII("extension_resource_request_policy") 92 test_data_dir_.AppendASCII("extension_resource_request_policy")
93 .AppendASCII("index.html"), &file_source)); 93 .AppendASCII("index.html"), &file_source));
94 ui_test_utils::NavigateToURL(browser(), 94 ui_test_utils::NavigateToURL(browser(),
95 GURL(std::string("data:text/html;charset=utf-8,") + file_source)); 95 GURL(std::string("data:text/html;charset=utf-8,") + file_source));
96 ASSERT_TRUE(content::ExecuteScriptAndExtractString( 96 ASSERT_TRUE(content::ExecuteScriptAndExtractString(
97 browser()->tab_strip_model()->GetActiveWebContents(), 97 browser()->tab_strip_model()->GetActiveWebContents(),
98 "window.domAutomationController.send(document.title)", 98 "window.domAutomationController.send(document.title)",
99 &result)); 99 &result));
100 EXPECT_EQ(result, "Loaded"); 100 EXPECT_EQ(result, "Loaded");
101 101
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 284
285 #if defined(OS_MACOSX) 285 #if defined(OS_MACOSX)
286 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources 286 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources
287 #else 287 #else
288 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources 288 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources
289 #endif 289 #endif
290 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 290 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
291 MAYBE_ExtensionAccessibleResources) { 291 MAYBE_ExtensionAccessibleResources) {
292 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; 292 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_;
293 } 293 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_creator.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698