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

Side by Side Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 11231077: Move a bunch more code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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/memory/singleton.h" 6 #include "base/memory/singleton.h"
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "base/test/test_timeouts.h" 8 #include "base/test/test_timeouts.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "content/browser/browser_plugin/browser_plugin_guest.h" 10 #include "content/browser/browser_plugin/browser_plugin_guest.h"
(...skipping 15 matching lines...) Expand all
26 #include "content/test/content_browser_test.h" 26 #include "content/test/content_browser_test.h"
27 #include "net/base/net_util.h" 27 #include "net/base/net_util.h"
28 #include "net/test/test_server.h" 28 #include "net/test/test_server.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
30 30
31 using WebKit::WebInputEvent; 31 using WebKit::WebInputEvent;
32 using WebKit::WebMouseEvent; 32 using WebKit::WebMouseEvent;
33 using content::BrowserPluginEmbedder; 33 using content::BrowserPluginEmbedder;
34 using content::BrowserPluginGuest; 34 using content::BrowserPluginGuest;
35 using content::BrowserPluginHostFactory; 35 using content::BrowserPluginHostFactory;
36 using content::WebContentsImpl;
36 37
37 namespace { 38 namespace {
38 39
39 const char kHTMLForGuest[] = 40 const char kHTMLForGuest[] =
40 "data:text/html,<html><body>hello world</body></html>"; 41 "data:text/html,<html><body>hello world</body></html>";
41 const char kHTMLForGuestInfiniteLoop[] = 42 const char kHTMLForGuestInfiniteLoop[] =
42 "data:text/html,<html><head><script type=\"text/javascript\">" 43 "data:text/html,<html><head><script type=\"text/javascript\">"
43 "function StartInfiniteLoop() {" 44 "function StartInfiniteLoop() {"
44 " setTimeout(function () {while (true) {} }, 0);" 45 " setTimeout(function () {while (true) {} }, 0);"
45 "}" 46 "}"
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 string16 actual_title = title_watcher.WaitAndGetTitle(); 957 string16 actual_title = title_watcher.WaitAndGetTitle();
957 EXPECT_EQ(expected_title, actual_title); 958 EXPECT_EQ(expected_title, actual_title);
958 scoped_ptr<base::Value> is_top_level(rvh->ExecuteJavascriptAndGetValue( 959 scoped_ptr<base::Value> is_top_level(rvh->ExecuteJavascriptAndGetValue(
959 string16(), ASCIIToUTF16("commitIsTopLevel"))); 960 string16(), ASCIIToUTF16("commitIsTopLevel")));
960 bool top_level_bool = false; 961 bool top_level_bool = false;
961 EXPECT_TRUE(is_top_level->GetAsBoolean(&top_level_bool)); 962 EXPECT_TRUE(is_top_level->GetAsBoolean(&top_level_bool));
962 EXPECT_EQ(true, top_level_bool); 963 EXPECT_EQ(true, top_level_bool);
963 } 964 }
964 965
965 } // namespace content 966 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_embedder.h ('k') | content/browser/browser_plugin/browser_plugin_host_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698