diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 23:19:47 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-07 23:19:47 +0000 |
| commit | 0eef4afcc284b2bb033e1e6097c0680257533081 (patch) | |
| tree | e6e3cbfd9028a849b217ee61bcdc55daa732bf3b | |
| parent | 710e98838dcc6a98a08c74614ed58df4de71c5f1 (diff) | |
| download | chromium_src-0eef4afcc284b2bb033e1e6097c0680257533081.zip chromium_src-0eef4afcc284b2bb033e1e6097c0680257533081.tar.gz chromium_src-0eef4afcc284b2bb033e1e6097c0680257533081.tar.bz2 | |
Fix NPAPIIncognitoTester.PrivateEnabled
BUG=16149
Review URL: http://codereview.chromium.org/155182
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20099 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 2 | ||||
| -rw-r--r-- | webkit/glue/plugins/test/plugin_client.cc | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index 83ea533..48de979 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -279,7 +279,7 @@ TEST_F(NPAPIIncognitoTester, PrivateEnabled) { if (UITest::in_process_renderer()) return; - GURL url = GetTestUrl(L"npapi", L"private.html?secure"); + GURL url = GetTestUrl(L"npapi", L"private.html?private"); NavigateToURL(url); WaitForFinish("private", "1", url, kTestCompleteCookie, kTestCompleteSuccess, kShortWaitTimeout); diff --git a/webkit/glue/plugins/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc index 39e1fae..bcad2a8 100644 --- a/webkit/glue/plugins/test/plugin_client.cc +++ b/webkit/glue/plugins/test/plugin_client.cc @@ -149,11 +149,8 @@ NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, new_test = new NPAPIClient::ExecuteJavascriptPopupWindowTargetPluginTest( instance, NPAPIClient::PluginClient::HostFunctions()); } else if (test_name == "private") { -// http://code.google.com/p/chromium/issues/detail?id=16149 -#if 0 new_test = new NPAPIClient::PrivateTest(instance, NPAPIClient::PluginClient::HostFunctions()); -#endif #if defined(OS_WIN) // TODO(port): plugin_windowed_test.*. } else if (test_name == "hidden_plugin" || |