summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authormaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 12:54:04 +0000
committermaruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-10 12:54:04 +0000
commitf09c718082535c0de7f066cb63f95809070f35a6 (patch)
tree0c7bbd37cccef8748b8c6e1768d2d95f7989a1a0 /chrome/test/ui
parent15567be3dd3dacb0abae800ede436eac8123482c (diff)
downloadchromium_src-f09c718082535c0de7f066cb63f95809070f35a6.zip
chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.gz
chromium_src-f09c718082535c0de7f066cb63f95809070f35a6.tar.bz2
NO CODE CHANGE.
Fix files with lines > 80 cols. Part 2. Review URL: http://codereview.chromium.org/40226 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11326 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/layout_plugin_uitest.cpp9
-rw-r--r--chrome/test/ui/omnibox_uitest.cc4
2 files changed, 8 insertions, 5 deletions
diff --git a/chrome/test/ui/layout_plugin_uitest.cpp b/chrome/test/ui/layout_plugin_uitest.cpp
index 5743580..fa46e2a 100644
--- a/chrome/test/ui/layout_plugin_uitest.cpp
+++ b/chrome/test/ui/layout_plugin_uitest.cpp
@@ -47,9 +47,12 @@ class LayoutPluginTester : public UITest {
TEST_F(LayoutPluginTester, UnloadNoCrash) {
// We need to copy our test-plugin into the plugins directory so that
// the browser can load it.
- std::wstring plugins_directory = browser_directory_ + L"\\plugins";
- std::wstring plugin_src = browser_directory_ + L"\\npapi_layout_test_plugin.dll";
- std::wstring plugin_dest = plugins_directory + L"\\npapi_layout_test_plugin.dll";
+ std::wstring plugins_directory = browser_directory_;
+ plugins_directory += L"\\plugins";
+ std::wstring plugin_src = browser_directory_;
+ plugin_src += L"\\npapi_layout_test_plugin.dll";
+ std::wstring plugin_dest = plugins_directory;
+ plugin_dest += L"\\npapi_layout_test_plugin.dll";
CreateDirectory(plugins_directory.c_str(), NULL);
CopyFile(plugin_src.c_str(), plugin_dest.c_str(), true /* overwrite */);
diff --git a/chrome/test/ui/omnibox_uitest.cc b/chrome/test/ui/omnibox_uitest.cc
index f77a301..bdee1bd 100644
--- a/chrome/test/ui/omnibox_uitest.cc
+++ b/chrome/test/ui/omnibox_uitest.cc
@@ -57,8 +57,8 @@ class OmniboxTest : public UITest {
bool OmniboxTest::IsMatch(const std::wstring& input_text,
const std::wstring& suggestion) {
- // This prefix list comes from the list used in history_url_provider.cc withiff
- // the exception of "ftp." and "www.".
+ // This prefix list comes from the list used in history_url_provider.cc
+ // withiff the exception of "ftp." and "www.".
std::wstring prefixes[] = {L"", L"ftp://", L"http://", L"https://",
L"ftp.", L"www.", L"ftp://www.", L"ftp://ftp.",
L"http://www.", L"https://www."};