Revert 239280 "Move more file_util functions to base namespace."

trunk/src/content/test/plugin/plugin_geturl_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/plugin/plugin_geturl_test.h"
 
 #include <stdio.h>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
@@ skipping 194 matching lines @@
 
 #if defined(OS_WIN)
         filename = filename.substr(8);  // remove "file:///"
         // Assume an ASCII path on Windows.
         base::FilePath path = base::FilePath(ASCIIToWide(filename));
 #else
         filename = filename.substr(7);  // remove "file://"
         base::FilePath path = base::FilePath(filename);
 #endif
 
-        test_file_ = base::OpenFile(path, "r");
+        test_file_ = file_util::OpenFile(path, "r");
         if (!test_file_) {
           SetError("Could not open source file");
         }
       }
       break;
     case BOGUS_URL_STREAM_ID:
       SetError("Unexpected NewStream for BOGUS_URL");
       break;
     case REDIRECT_SRC_URL_NOTIFICATION_CANCEL_ID:
       SetError("Should not redirect to URL when plugin denied it.");
@@ skipping 123 matching lines @@
       // don't care
       break;
     case REDIRECT_SRC_URL_NOTIFICATION_ALLOW_ID:
       break;
     case FETCHED_URL_STREAM_ID:
       {
         char read_buffer[STREAM_CHUNK];
         size_t bytes = fread(read_buffer, 1, sizeof(read_buffer), test_file_);
         if (bytes != 0)
           SetError("Data and source mismatch on length");
-        base::CloseFile(test_file_);
+        file_util::CloseFile(test_file_);
       }
       break;
     default:
       SetError("Unexpected NewStream callback");
       break;
   }
   return NPERR_NO_ERROR;
 }
 
 void PluginGetURLTest::StreamAsFile(NPStream* stream, const char* fname) {
@@ skipping 98 matching lines @@
         id(), REDIRECT_SRC_URL, NULL,
         reinterpret_cast<void*>(REDIRECT_SRC_URL_NOTIFICATION_ALLOW_ID));
     }
   } else if (stream_id == REDIRECT_SRC_URL_NOTIFICATION_ALLOW_ID) {
     received_url_redirect_allow_notification_ = true;
     HostFunctions()->urlredirectresponse(id(), notify_data, true);
   }
 }
 
 } // namespace NPAPIClient