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

8 files changed, 23 insertions, 23 deletions

diff --git a/chrome/test/accessibility/accessibility_tests.cc b/chrome/test/accessibility/accessibility_tests.cc
index 84dee3b..f00f9e4 100644
--- a/chrome/test/accessibility/accessibility_tests.cc
+++ b/chrome/test/accessibility/accessibility_tests.cc
@@ -218,7 +218,7 @@ TEST_F(AccessibilityTest, TestStarBtnStatusOnNewTab) {
   ASSERT_TRUE(tab1.get());
   std::wstring test_file1 = test_data_directory_;
   file_util::AppendToPath(&test_file1, L"title1.html");
-  tab1->NavigateToURL(net_util::FilePathToFileURL(test_file1));
+  tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
   Sleep(kWaitForActionMsec);
   EXPECT_EQ(L"focusable", GetState(p_toolbar, button));
 
@@ -239,7 +239,7 @@ TEST_F(AccessibilityTest, TestStarBtnStatusOnNewTab) {
   old_tab_count = new_tab_count;
   std::wstring test_file2 = test_data_directory_;
   file_util::AppendToPath(&test_file2, L"title1.html");
-  ASSERT_TRUE(window->AppendTab(net_util::FilePathToFileURL(test_file2)));
+  ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
   ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
               5000));
   // Check tab count. Also, check accessibility object's children.
@@ -320,7 +320,7 @@ TEST_F(AccessibilityTest, DISABLED_TestBackBtnStatusOnNewTab) {
   ASSERT_TRUE(tab1.get());
   std::wstring test_file1 = test_data_directory_;
   file_util::AppendToPath(&test_file1, L"title1.html");
-  tab1->NavigateToURL(net_util::FilePathToFileURL(test_file1));
+  tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
   Sleep(kWaitForActionMsec);
   if (win_util::GetWinVersion() > win_util::WINVERSION_2000) {
     EXPECT_EQ(L"has popup, focusable",
@@ -356,7 +356,7 @@ TEST_F(AccessibilityTest, DISABLED_TestBackBtnStatusOnNewTab) {
   old_tab_count = new_tab_count;
   std::wstring test_file2 = test_data_directory_;
   file_util::AppendToPath(&test_file2, L"title1.html");
-  ASSERT_TRUE(window->AppendTab(net_util::FilePathToFileURL(test_file2)));
+  ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
   ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
               5000));
   // Check tab count. Also, check accessibility object's children.
@@ -441,7 +441,7 @@ TEST_F(AccessibilityTest, DISABLED_TestForwardBtnStatusOnNewTab) {
   ASSERT_TRUE(tab1.get());
   std::wstring test_file1 = test_data_directory_;
   file_util::AppendToPath(&test_file1, L"title1.html");
-  tab1->NavigateToURL(net_util::FilePathToFileURL(test_file1));
+  tab1->NavigateToURL(net::FilePathToFileURL(test_file1));
   Sleep(kWaitForActionMsec);
   if (win_util::GetWinVersion() > win_util::WINVERSION_2000) {
     EXPECT_EQ(L"has popup, focusable, unavailable",
@@ -486,7 +486,7 @@ TEST_F(AccessibilityTest, DISABLED_TestForwardBtnStatusOnNewTab) {
   old_tab_count = new_tab_count;
   std::wstring test_file2 = test_data_directory_;
   file_util::AppendToPath(&test_file2, L"title1.html");
-  ASSERT_TRUE(window->AppendTab(net_util::FilePathToFileURL(test_file2)));
+  ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(test_file2)));
   ASSERT_TRUE(window->WaitForTabCountToChange(old_tab_count, &new_tab_count,
               5000));
   // Check tab count.
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index b639007..74a2eef 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -197,7 +197,7 @@ TEST_F(AutomationProxyVisibleTest, AppendTab) {
 
   std::wstring filename(test_data_directory_);
   file_util::AppendToPath(&filename, L"title2.html");
-  ASSERT_TRUE(window->AppendTab(net_util::FilePathToFileURL(filename)));
+  ASSERT_TRUE(window->AppendTab(net::FilePathToFileURL(filename)));
 
   int appended_tab_index;
   // Append tab will also be active tab
@@ -266,7 +266,7 @@ TEST_F(AutomationProxyTest, NavigateToURL) {
   std::wstring filename(test_data_directory_);
   file_util::AppendToPath(&filename, L"title2.html");
 
-  tab->NavigateToURL(net_util::FilePathToFileURL(filename));
+  tab->NavigateToURL(net::FilePathToFileURL(filename));
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 
@@ -284,7 +284,7 @@ TEST_F(AutomationProxyTest, DISABLED_NavigateToURLWithTimeout1) {
   file_util::AppendToPath(&filename, L"title2.html");
 
   bool is_timeout;
-  tab->NavigateToURLWithTimeout(net_util::FilePathToFileURL(filename),
+  tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename),
                                 10000, &is_timeout);
   ASSERT_FALSE(is_timeout);
 
@@ -292,7 +292,7 @@ TEST_F(AutomationProxyTest, DISABLED_NavigateToURLWithTimeout1) {
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 
-  tab->NavigateToURLWithTimeout(net_util::FilePathToFileURL(filename),
+  tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename),
                                 1, &is_timeout);
   ASSERT_TRUE(is_timeout);
 
@@ -311,13 +311,13 @@ TEST_F(AutomationProxyTest, DISABLED_NavigateToURLWithTimeout2) {
   file_util::AppendToPath(&filename1, L"title1.html");
 
   bool is_timeout;
-  tab->NavigateToURLWithTimeout(net_util::FilePathToFileURL(filename1),
+  tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename1),
                                 1, &is_timeout);
   ASSERT_TRUE(is_timeout);
 
   std::wstring filename2(test_data_directory_);
   file_util::AppendToPath(&filename2, L"title2.html");
-  tab->NavigateToURLWithTimeout(net_util::FilePathToFileURL(filename2),
+  tab->NavigateToURLWithTimeout(net::FilePathToFileURL(filename2),
                                 10000, &is_timeout);
   ASSERT_FALSE(is_timeout);
 
@@ -341,7 +341,7 @@ TEST_F(AutomationProxyTest, GoBackForward) {
 
   std::wstring filename(test_data_directory_);
   file_util::AppendToPath(&filename, L"title2.html");
-  ASSERT_TRUE(tab->NavigateToURL(net_util::FilePathToFileURL(filename)));
+  ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
   ASSERT_TRUE(tab->GetTabTitle(&title));
   ASSERT_STREQ(L"Title Of Awesomeness", title.c_str());
 
@@ -370,7 +370,7 @@ TEST_F(AutomationProxyTest, GetCurrentURL) {
 
   std::wstring filename(test_data_directory_);
   file_util::AppendToPath(&filename, L"cookie1.html");
-  GURL newurl = net_util::FilePathToFileURL(filename);
+  GURL newurl = net::FilePathToFileURL(filename);
   ASSERT_TRUE(tab->NavigateToURL(newurl));
   ASSERT_TRUE(tab->GetCurrentURL(&url));
   // compare canonical urls...
@@ -476,7 +476,7 @@ TEST_F(AutomationProxyTest, NavigateToURLAsync) {
 
   std::wstring filename(test_data_directory_);
   file_util::AppendToPath(&filename, L"cookie1.html");
-  GURL newurl = net_util::FilePathToFileURL(filename);
+  GURL newurl = net::FilePathToFileURL(filename);
 
   ASSERT_TRUE(tab->NavigateToURLAsync(newurl));
   std::string value = WaitUntilCookieNonEmpty(tab.get(), newurl,
@@ -664,7 +664,7 @@ TEST_F(AutomationProxyTest, ConstrainedWindowTest) {
   file_util::AppendToPath(&filename, L"constrained_files");
   file_util::AppendToPath(&filename, L"constrained_window.html");
 
-  ASSERT_TRUE(tab->NavigateToURL(net_util::FilePathToFileURL(filename)));
+  ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
   int count;
   ASSERT_TRUE(tab->WaitForChildWindowCountToChange(0, &count, 5000));
@@ -698,7 +698,7 @@ TEST_F(AutomationProxyTest, CantEscapeByOnloadMoveto) {
   file_util::AppendToPath(&filename, L"constrained_files");
   file_util::AppendToPath(&filename, L"constrained_window_onload_moveto.html");
 
-  ASSERT_TRUE(tab->NavigateToURL(net_util::FilePathToFileURL(filename)));
+  ASSERT_TRUE(tab->NavigateToURL(net::FilePathToFileURL(filename)));
 
   int count;
   ASSERT_TRUE(tab->WaitForChildWindowCountToChange(0, &count, 5000));
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 421c665..b9a77bd 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -86,7 +86,7 @@ class PageCyclerTest : public UITest {
       file_util::AppendToPath(&test_path, L"page_cycler");
       file_util::AppendToPath(&test_path, name);
       file_util::AppendToPath(&test_path, L"start.html");
-      test_url = net_util::FilePathToFileURL(test_path);
+      test_url = net::FilePathToFileURL(test_path);
     }
 
     // run N iterations
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index c9f16c1..98a4300 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -114,7 +114,7 @@ class PluginTest : public UITest {
     PathService::Get(chrome::DIR_TEST_DATA, &path);
     file_util::AppendToPath(&path, L"plugin");
     file_util::AppendToPath(&path, test_case);
-    return net_util::FilePathToFileURL(path);
+    return net::FilePathToFileURL(path);
   }
 
   // Waits for the test case to finish.
diff --git a/chrome/test/selenium/selenium_test.cc b/chrome/test/selenium/selenium_test.cc
index 043def8..5db6bb1 100644
--- a/chrome/test/selenium/selenium_test.cc
+++ b/chrome/test/selenium/selenium_test.cc
@@ -125,7 +125,7 @@ class SeleniumTest : public UITest {
     file_util::AppendToPath(&test_path, L"core");
     file_util::AppendToPath(&test_path, L"TestRunner.html");
 
-    GURL test_url(net_util::FilePathToFileURL(test_path));
+    GURL test_url(net::FilePathToFileURL(test_path));
     scoped_ptr<TabProxy> tab(GetActiveTab());
     tab->NavigateToURL(test_url);
 
diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc
index f2c572b..fb16816 100644
--- a/chrome/test/tab_switching/tab_switching_test.cc
+++ b/chrome/test/tab_switching/tab_switching_test.cc
@@ -148,7 +148,7 @@ class TabSwitchingUITest : public UITest {
       file_name += files[i];
       file_name += file_util::kPathSeparator;
       file_name += L"index.html";
-      browser_proxy_->AppendTab(net_util::FilePathToFileURL(file_name));
+      browser_proxy_->AppendTab(net::FilePathToFileURL(file_name));
       number_of_new_tabs_opened++;
     }
 
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.