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

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 325443002: Move about://-related constants from //content to //url (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 1104 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 1115
1116 GURL url = GetTestFileUrl("View_PageHideShow"); 1116 GURL url = GetTestFileUrl("View_PageHideShow");
1117 ui_test_utils::NavigateToURL(browser(), url); 1117 ui_test_utils::NavigateToURL(browser(), url);
1118 1118
1119 ASSERT_TRUE(observer.Run()) << handler.error_message(); 1119 ASSERT_TRUE(observer.Run()) << handler.error_message();
1120 EXPECT_STREQ("TestPageHideShow:Created", handler.message().c_str()); 1120 EXPECT_STREQ("TestPageHideShow:Created", handler.message().c_str());
1121 observer.Reset(); 1121 observer.Reset();
1122 1122
1123 // Make a new tab to cause the original one to hide, this should trigger the 1123 // Make a new tab to cause the original one to hide, this should trigger the
1124 // next phase of the test. 1124 // next phase of the test.
1125 chrome::NavigateParams params(browser(), GURL(content::kAboutBlankURL), 1125 chrome::NavigateParams params(browser(), GURL(url::kAboutBlankURL),
1126 content::PAGE_TRANSITION_LINK); 1126 content::PAGE_TRANSITION_LINK);
1127 params.disposition = NEW_FOREGROUND_TAB; 1127 params.disposition = NEW_FOREGROUND_TAB;
1128 ui_test_utils::NavigateToURL(&params); 1128 ui_test_utils::NavigateToURL(&params);
1129 1129
1130 // Wait until the test acks that it got hidden. 1130 // Wait until the test acks that it got hidden.
1131 ASSERT_TRUE(observer.Run()) << handler.error_message(); 1131 ASSERT_TRUE(observer.Run()) << handler.error_message();
1132 EXPECT_STREQ("TestPageHideShow:Hidden", handler.message().c_str()); 1132 EXPECT_STREQ("TestPageHideShow:Hidden", handler.message().c_str());
1133 observer.Reset(); 1133 observer.Reset();
1134 1134
1135 // Switch back to the test tab. 1135 // Switch back to the test tab.
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 LIST_TEST(FlashDRM_GetHmonitor) 1262 LIST_TEST(FlashDRM_GetHmonitor)
1263 LIST_TEST(FlashDRM_GetVoucherFile)); 1263 LIST_TEST(FlashDRM_GetVoucherFile));
1264 } 1264 }
1265 1265
1266 TEST_PPAPI_IN_PROCESS(TalkPrivate) 1266 TEST_PPAPI_IN_PROCESS(TalkPrivate)
1267 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) 1267 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate)
1268 1268
1269 #if defined(OS_CHROMEOS) 1269 #if defined(OS_CHROMEOS)
1270 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) 1270 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate)
1271 #endif 1271 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698