From 8392ccddddf7f355d57871a5e9af37750f7139f8 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
 <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 10 Nov 2012 00:46:16 +0000
Subject: Move stack_container and linked_list to the new containers
 subdirectory.

This also replaces the StackWString with StackString16 and adds a char traits definition to the string16 header file to make this possible without ifdefs.

BUG=

Review URL: https://codereview.chromium.org/11360174

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167022 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome_frame/chrome_frame_automation.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'chrome_frame')

diff --git a/chrome_frame/chrome_frame_automation.h b/chrome_frame/chrome_frame_automation.h
index 8d591fc..c8d5ad0 100644
--- a/chrome_frame/chrome_frame_automation.h
+++ b/chrome_frame/chrome_frame_automation.h
@@ -11,9 +11,9 @@
 #include <string>
 #include <vector>
 
+#include "base/containers/stack_container.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_handle.h"
-#include "base/stack_container.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/timer.h"
@@ -294,7 +294,7 @@ class ProxyFactory {
                                        LaunchDelegate* delegate);
 
  private:
-  typedef StackVector<scoped_refptr<AutomationProxyCacheEntry>, 4> Vector;
+  typedef base::StackVector<scoped_refptr<AutomationProxyCacheEntry>, 4> Vector;
   Vector proxies_;
   // Lock if we are going to call GetAutomationServer from more than one thread.
   base::Lock lock_;
-- 
cgit v1.1