Revert 161840 - Compile fix for windows after r161839

content/shell/shell_browser_main.cc

 // Copyright (c) 2012 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/shell/shell_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_runner_host.h"
 #include "net/base/net_util.h"
 #include "webkit/support/webkit_support.h"
 
 namespace {
 
 GURL GetURLForLayoutTest(const char* test_name,
@@ skipping 13 matching lines @@
     pixel_hash = pixel_switch.substr(separator_position + 1);
     pixel_switch.erase(separator_position);
   }
   if (enable_pixel_dumping) {
     *enable_pixel_dumping =
         (pixel_switch == "--pixel-test" || pixel_switch == "-p");
   }
   if (expected_pixel_hash)
     *expected_pixel_hash = pixel_hash;
   GURL test_url(path_or_url);
-  if (!(test_url.is_valid() && test_url.has_scheme())) {
-#if defined(OS_WIN)
-    std::wstring wide_path_or_url =
-        base::SysNativeMBToWide(path_or_url);
+  if (!(test_url.is_valid() && test_url.has_scheme()))
     test_url = net::FilePathToFileURL(FilePath(path_or_url));
-#else
-    test_url = net::FilePathToFileURL(FilePath(path_or_url));
-#endif
-  }
   FilePath local_path;
   if (net::FileURLToFilePath(test_url, &local_path)) {
     // We're outside of the message loop here, and this is a test.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     file_util::SetCurrentDirectory(local_path.DirName());
   }
   return test_url;
 }
 
 }  // namespace
@@ skipping 50 matching lines @@
     }
     exit_code = 0;
   } else {
     exit_code = main_runner_->Run();
   }
 
   main_runner_->Shutdown();
 
   return exit_code;
 }