Move stack_container and linked_list to the new containers subdirectory.

webkit/tools/test_shell/test_shell_win.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 "webkit/tools/test_shell/test_shell.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <objbase.h>
 #include <process.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
+#include "base/containers/stack_container.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
-#include "base/stack_container.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/resource_util.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "grit/webkit_chromium_resources.h"
 #include "grit/webkit_resources.h"
 #include "net/base/net_module.h"
 #include "net/url_request/url_request_file_job.h"
 #include "skia/ext/bitmap_platform_device.h"
@@ skipping 63 matching lines @@
                       MDRawAssertionInfo *assertion,
                       bool succeeded) {
   // Warning: Don't use the heap in this function.  It may be corrupted.
   if (!g_currentTestName[0])
     return false;
 
   // Try to rename the minidump file to include the crashed test's name.
   // StackString uses the stack but overflows onto the heap.  But we don't
   // care too much about being completely correct here, since most crashes
   // will be happening on developers' machines where they have debuggers.
-  StackWString<kPathBufSize * 2> origPath;
+  base::StackString16<kPathBufSize * 2> origPath;
   origPath->append(dumpPath);
   origPath->push_back(FilePath::kSeparators[0]);
   origPath->append(minidumpID);
   origPath->append(L".dmp");
 
-  StackWString<kPathBufSize * 2> newPath;
+  base::StackString16<kPathBufSize * 2> newPath;
   newPath->append(dumpPath);
   newPath->push_back(FilePath::kSeparators[0]);
   newPath->append(g_currentTestName);
   newPath->append(L"-");
   newPath->append(minidumpID);
   newPath->append(L".dmp");
 
   // May use the heap, but oh well.  If this fails, we'll just have the
   // original dump file lying around.
   _wrename(origPath->c_str(), newPath->c_str());
@@ skipping 625 matching lines @@
 
 bool EnsureFontLoaded(HFONT font) {
   return true;
 }
 
 bool DownloadUrl(const std::string& url, HWND caller_window) {
   return false;
 }
 
 }  // namespace webkit_glue