Move stack_container and linked_list to the new containers subdirectory.

webkit/tools/test_shell/test_shell_win.cc

Index: webkit/tools/test_shell/test_shell_win.cc
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 35cf50be62c14a1f4af4f59af295ea3840e78fb8..b2d2c465de7d930c331ba82412d3156510deadd2 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -11,11 +11,11 @@
 #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"
@@ -99,13 +99,13 @@ bool MinidumpCallback(const wchar_t *dumpPath,
   // 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);