diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:19:00 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-06 22:19:00 +0000 |
| commit | 480779dd7e77552f4d1190b9804109dc0083df27 (patch) | |
| tree | b542f44216712c56dd7e71d394079fa59069330e /app/clipboard | |
| parent | 3b2d7768f6797c2b34c2517b01cf9efc073e5c93 (diff) | |
| download | chromium_src-480779dd7e77552f4d1190b9804109dc0083df27.zip chromium_src-480779dd7e77552f4d1190b9804109dc0083df27.tar.gz chromium_src-480779dd7e77552f4d1190b9804109dc0083df27.tar.bz2 | |
app: string_util.h -> utf_string_conversions.h fix.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/668226
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/clipboard')
| -rw-r--r-- | app/clipboard/clipboard_linux.cc | 3 | ||||
| -rw-r--r-- | app/clipboard/clipboard_unittest.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/clipboard/clipboard_linux.cc b/app/clipboard/clipboard_linux.cc index 740ec76..fbffd98 100644 --- a/app/clipboard/clipboard_linux.cc +++ b/app/clipboard/clipboard_linux.cc @@ -12,9 +12,10 @@ #include "base/file_path.h" #include "base/gfx/size.h" +#include "base/logging.h" #include "base/scoped_ptr.h" #include "base/linux_util.h" -#include "base/string_util.h" +#include "base/utf_string_conversions.h" namespace { diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc index a980679..e8c5ee0 100644 --- a/app/clipboard/clipboard_unittest.cc +++ b/app/clipboard/clipboard_unittest.cc @@ -14,6 +14,7 @@ #include "base/message_loop.h" #include "base/pickle.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -44,7 +45,7 @@ bool ClipboardContentsIsExpected(const string16& copied_markup, #endif } -} // namespace +} // namespace TEST_F(ClipboardTest, ClearTest) { Clipboard clipboard; |