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

Side by Side Diff: chrome/browser/extensions/extension_incognito_apitest.cc

Issue 7532034: Move in_process_browser_test and ui_test_utils to chrome/test/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/extensions/browser_action_test_util.h" 5 #include "chrome/browser/extensions/browser_action_test_util.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/extension_test_message_listener.h" 8 #include "chrome/browser/extensions/extension_test_message_listener.h"
9 #include "chrome/browser/extensions/user_script_master.h" 9 #include "chrome/browser/extensions/user_script_master.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_list.h" 12 #include "chrome/browser/ui/browser_list.h"
13 #include "chrome/browser/ui/browser_window.h" 13 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "chrome/test/ui_test_utils.h" 15 #include "chrome/test/base/ui_test_utils.h"
16 #include "content/browser/tab_contents/tab_contents.h" 16 #include "content/browser/tab_contents/tab_contents.h"
17 #include "net/base/mock_host_resolver.h" 17 #include "net/base/mock_host_resolver.h"
18 18
19 // In the touch build, this fails frequently. http://crbug.com/85205 19 // In the touch build, this fails frequently. http://crbug.com/85205
20 #if defined(TOUCH_UI) 20 #if defined(TOUCH_UI)
21 #define MAYBE_IncognitoNoScript FLAKY_IncognitoNoScript 21 #define MAYBE_IncognitoNoScript FLAKY_IncognitoNoScript
22 #else 22 #else
23 #define MAYBE_IncognitoNoScript IncognitoNoScript 23 #define MAYBE_IncognitoNoScript IncognitoNoScript
24 #endif 24 #endif
25 25
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 test_server()->GetURL("files/extensions/test_file.html")); 185 test_server()->GetURL("files/extensions/test_file.html"));
186 186
187 Browser* incognito_browser = BrowserList::FindTabbedBrowser( 187 Browser* incognito_browser = BrowserList::FindTabbedBrowser(
188 browser()->profile()->GetOffTheRecordProfile(), false); 188 browser()->profile()->GetOffTheRecordProfile(), false);
189 189
190 // Simulate the incognito's browser action being clicked. 190 // Simulate the incognito's browser action being clicked.
191 BrowserActionTestUtil(incognito_browser).Press(0); 191 BrowserActionTestUtil(incognito_browser).Press(0);
192 192
193 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 193 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
194 } 194 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_icon_source_apitest.cc ('k') | chrome/browser/extensions/extension_input_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698