diff options
Diffstat (limited to 'chrome/test/plugin/pdf_browsertest.cc')
| -rw-r--r-- | chrome/test/plugin/pdf_browsertest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/plugin/pdf_browsertest.cc b/chrome/test/plugin/pdf_browsertest.cc index 52b4bee..769df46 100644 --- a/chrome/test/plugin/pdf_browsertest.cc +++ b/chrome/test/plugin/pdf_browsertest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/clipboard/clipboard.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" @@ -22,6 +21,7 @@ #include "chrome/test/ui_test_utils.h" #include "gfx/codec/png_codec.h" #include "net/test/test_server.h" +#include "ui/base/clipboard/clipboard.h" extern base::hash_map<std::string, int> g_test_timeout_overrides; @@ -266,10 +266,10 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) { false, NULL)); // Verify that copying selected text works. - Clipboard clipboard; + ui::Clipboard clipboard; // Reset the clipboard first. - Clipboard::ObjectMap objects; - Clipboard::ObjectMapParams params; + ui::Clipboard::ObjectMap objects; + ui::Clipboard::ObjectMapParams params; params.push_back(std::vector<char>()); objects[Clipboard::CBF_TEXT] = params; clipboard.WriteObjects(objects); @@ -278,7 +278,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) { ASSERT_NO_FATAL_FAILURE(WaitForResponse()); std::string text; - clipboard.ReadAsciiText(Clipboard::BUFFER_STANDARD, &text); + clipboard.ReadAsciiText(ui::Clipboard::BUFFER_STANDARD, &text); ASSERT_EQ("adipiscing", text); } |