Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(547)

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_path.h" 9 #include "base/file_path.h"
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
(...skipping 1604 matching lines...) Expand 10 before | Expand all | Expand 10 after
1615 1615
1616 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 1616 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
1617 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 1617 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
1618 FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile"); 1618 FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile");
1619 tmp_profile = tmp_profile.Append(L"Test Chrome G\u00E9raldine"); 1619 tmp_profile = tmp_profile.Append(L"Test Chrome G\u00E9raldine");
1620 1620
1621 ASSERT_TRUE(file_util::CreateDirectory(tmp_profile)); 1621 ASSERT_TRUE(file_util::CreateDirectory(tmp_profile));
1622 command_line->AppendSwitchPath(switches::kUserDataDir, tmp_profile); 1622 command_line->AppendSwitchPath(switches::kUserDataDir, tmp_profile);
1623 } 1623 }
1624 1624
1625 ScopedTempDir temp_dir_; 1625 base::ScopedTempDir temp_dir_;
1626 }; 1626 };
1627 1627
1628 IN_PROC_BROWSER_TEST_F(LaunchBrowserWithNonAsciiUserDatadir, 1628 IN_PROC_BROWSER_TEST_F(LaunchBrowserWithNonAsciiUserDatadir,
1629 TestNonAsciiUserDataDir) { 1629 TestNonAsciiUserDataDir) {
1630 // Verify that the window is present. 1630 // Verify that the window is present.
1631 ASSERT_TRUE(browser()); 1631 ASSERT_TRUE(browser());
1632 } 1632 }
1633 #endif // defined(OS_WIN) 1633 #endif // defined(OS_WIN)
1634 1634
1635 // Tests to ensure that the browser continues running in the background after 1635 // Tests to ensure that the browser continues running in the background after
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
1932 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 1932 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
1933 } 1933 }
1934 1934
1935 // Shift-middle-clicks open in a foreground tab. 1935 // Shift-middle-clicks open in a foreground tab.
1936 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) { 1936 IN_PROC_BROWSER_TEST_F(ClickModifierTest, HrefShiftMiddleClickTest) {
1937 int modifiers = WebKit::WebInputEvent::ShiftKey; 1937 int modifiers = WebKit::WebInputEvent::ShiftKey;
1938 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle; 1938 WebKit::WebMouseEvent::Button button = WebKit::WebMouseEvent::ButtonMiddle;
1939 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB; 1939 WindowOpenDisposition disposition = NEW_FOREGROUND_TAB;
1940 RunTest(browser(), GetHrefURL(), modifiers, button, disposition); 1940 RunTest(browser(), GetHrefURL(), modifiers, button, disposition);
1941 } 1941 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/bookmarks/bookmark_browsertest.cc ('k') | chrome/browser/ui/browser_close_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698