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

3 files changed, 5 insertions, 5 deletions

diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc
index bfde855..7f5be5f 100644
--- a/webkit/tools/test_shell/plugin_tests.cc
+++ b/webkit/tools/test_shell/plugin_tests.cc
@@ -54,7 +54,7 @@ class PluginTest : public TestShellTest {
   class RequestContext : public TestURLRequestContext {
    public:
     RequestContext() {
-      cookie_store_ = new CookieMonster();
+      cookie_store_ = new net::CookieMonster();
     }
 
     virtual ~RequestContext() {
@@ -68,7 +68,7 @@ class PluginTest : public TestShellTest {
 
   void NavigateToURL(const std::wstring& test_url) {
     ASSERT_TRUE(file_util::PathExists(test_url));
-    test_url_ = net_util::FilePathToFileURL(test_url);
+    test_url_ = net::FilePathToFileURL(test_url);
     test_shell_->LoadURL(test_url.c_str());
   }
 
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 0256fed..468ec36 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -174,7 +174,7 @@ int main(int argc, char* argv[])
 
     if (layout_test_mode ||
         parsed_command_line.HasSwitch(test_shell::kEnableFileCookies))
-      CookieMonster::EnableFileScheme();
+      net::CookieMonster::EnableFileScheme();
 
     std::wstring cache_path =
         parsed_command_line.GetSwitchValue(test_shell::kCacheDir);
@@ -192,7 +192,7 @@ int main(int argc, char* argv[])
     icu_util::Initialize();
 
     // Config the network module so it has access to a limited set of resources.
-    NetModule::SetResourceProvider(NetResourceProvider);
+    net::NetModule::SetResourceProvider(NetResourceProvider);
 
     INITCOMMONCONTROLSEX InitCtrlEx;
 
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index 0406e01..16282f2 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -45,7 +45,7 @@ TestShellRequestContext::TestShellRequestContext(
 void TestShellRequestContext::Init(
     const std::wstring& cache_path,
     net::HttpCache::Mode cache_mode) {
-  cookie_store_ = new CookieMonster();
+  cookie_store_ = new net::CookieMonster();
 
   user_agent_ = webkit_glue::GetDefaultUserAgent();