summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 19:40:37 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-07-31 19:40:37 +0000
commit8ac1a75acadaa2aae065212cb6255d00c789a184 (patch)
tree854eaf66ba8ce7e581bd8e6f1fa75f46d22f4bb7 /chrome/test/ui
parent287a019ed5d015185cab41f6c7156dc6c4cbcee7 (diff)
downloadchromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.zip
chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.gz
chromium_src-8ac1a75acadaa2aae065212cb6255d00c789a184.tar.bz2
Move more net classes into the net namespace. Also remove the net_util namespace in favor of the net namespace.
This is a purely mechanical change. There should be no logic changes. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/layout_plugin_uitest.cpp2
-rw-r--r--chrome/test/ui/npapi_uitest.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/ui/layout_plugin_uitest.cpp b/chrome/test/ui/layout_plugin_uitest.cpp
index 1a3e973..5743580 100644
--- a/chrome/test/ui/layout_plugin_uitest.cpp
+++ b/chrome/test/ui/layout_plugin_uitest.cpp
@@ -57,7 +57,7 @@ TEST_F(LayoutPluginTester, UnloadNoCrash) {
std::wstring path;
PathService::Get(chrome::DIR_TEST_DATA, &path);
file_util::AppendToPath(&path, L"npapi/layout_test_plugin.html");
- NavigateToURL(net_util::FilePathToFileURL(path));
+ NavigateToURL(net::FilePathToFileURL(path));
std::wstring title;
TabProxy* tab = GetActiveTab();
diff --git a/chrome/test/ui/npapi_uitest.cpp b/chrome/test/ui/npapi_uitest.cpp
index cf81db6..bd292e6 100644
--- a/chrome/test/ui/npapi_uitest.cpp
+++ b/chrome/test/ui/npapi_uitest.cpp
@@ -101,7 +101,7 @@ protected:
PathService::Get(chrome::DIR_TEST_DATA, &path);
file_util::AppendToPath(&path, L"npapi");
file_util::AppendToPath(&path, test_case);
- return net_util::FilePathToFileURL(path);
+ return net::FilePathToFileURL(path);
}
// Waits for the test case to finish.