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

Side by Side Diff: content/public/test/browser_test_utils.h

Issue 789273006: Make ContentSettingsObserver security checks work with OOPIF. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 11 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
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 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_ 5 #ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
6 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_ 6 #define CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
7 7
8 #include <queue> 8 #include <queue>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // If it only works with content_browsertests, it should be in 49 // If it only works with content_browsertests, it should be in
50 // content\test\content_browser_test_utils.h. 50 // content\test\content_browser_test_utils.h.
51 51
52 namespace content { 52 namespace content {
53 53
54 class BrowserContext; 54 class BrowserContext;
55 class MessageLoopRunner; 55 class MessageLoopRunner;
56 class RenderViewHost; 56 class RenderViewHost;
57 class WebContents; 57 class WebContents;
58 58
59 // Navigate a frame with ID |iframe_id| to |url|, blocking until the navigation
60 // finishes. Uses a renderer-initiated navigation from script code in the
61 // main frame.
62 bool NavigateIframeToURL(WebContents* web_contents,
63 std::string iframe_id,
64 const GURL& url);
65
59 // Generate a URL for a file path including a query string. 66 // Generate a URL for a file path including a query string.
60 GURL GetFileUrlWithQuery(const base::FilePath& path, 67 GURL GetFileUrlWithQuery(const base::FilePath& path,
61 const std::string& query_string); 68 const std::string& query_string);
62 69
63 // Checks whether the page type of the last committed navigation entry matches 70 // Checks whether the page type of the last committed navigation entry matches
64 // |page_type|. 71 // |page_type|.
65 bool IsLastCommittedEntryOfPageType(WebContents* web_contents, 72 bool IsLastCommittedEntryOfPageType(WebContents* web_contents,
66 content::PageType page_type); 73 content::PageType page_type);
67 74
68 // Waits for a load stop for the specified |web_contents|'s controller, if the 75 // Waits for a load stop for the specified |web_contents|'s controller, if the
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
376 WebContents* web_contents_; 383 WebContents* web_contents_;
377 scoped_ptr<RenderViewCreatedObserver> child_observer_; 384 scoped_ptr<RenderViewCreatedObserver> child_observer_;
378 scoped_refptr<MessageLoopRunner> runner_; 385 scoped_refptr<MessageLoopRunner> runner_;
379 386
380 DISALLOW_COPY_AND_ASSIGN(WebContentsAddedObserver); 387 DISALLOW_COPY_AND_ASSIGN(WebContentsAddedObserver);
381 }; 388 };
382 389
383 } // namespace content 390 } // namespace content
384 391
385 #endif // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_ 392 #endif // CONTENT_PUBLIC_TEST_BROWSER_TEST_UTILS_H_
OLDNEW
« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/public/test/browser_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698