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

Side by Side Diff: chrome/browser/app_controller_mac_browsertest.mm

Issue 2957983002: Remove pointless InProcessBrowserTest calls. (Closed)
Patch Set: build Created 3 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/budget_service/budget_manager_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #import <Carbon/Carbon.h> 5 #import <Carbon/Carbon.h>
6 #import <Cocoa/Cocoa.h> 6 #import <Cocoa/Cocoa.h>
7 #import <Foundation/Foundation.h> 7 #import <Foundation/Foundation.h>
8 #import <Foundation/NSAppleEventDescriptor.h> 8 #import <Foundation/NSAppleEventDescriptor.h>
9 #import <objc/message.h> 9 #import <objc/message.h>
10 #import <objc/runtime.h> 10 #import <objc/runtime.h>
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 SessionStartupPref pref(GetParam()); 426 SessionStartupPref pref(GetParam());
427 pref.urls.push_back(GURL(kPresetURL)); 427 pref.urls.push_back(GURL(kPresetURL));
428 SessionStartupPref::SetStartupPref(browser()->profile(), pref); 428 SessionStartupPref::SetStartupPref(browser()->profile(), pref);
429 } 429 }
430 430
431 protected: 431 protected:
432 void SetUpCommandLine(base::CommandLine* command_line) override { 432 void SetUpCommandLine(base::CommandLine* command_line) override {
433 set_open_about_blank_on_browser_launch(false); 433 set_open_about_blank_on_browser_launch(false);
434 // Skip AppControllerOpenShortcutBrowserTest::SetUpCommandLine, which adds 434 // Skip AppControllerOpenShortcutBrowserTest::SetUpCommandLine, which adds
435 // startup URL. 435 // startup URL.
436 InProcessBrowserTest::SetUpCommandLine(command_line);
437 } 436 }
438 437
439 SessionStartupPref::Type GetSessionStartupPref() { 438 SessionStartupPref::Type GetSessionStartupPref() {
440 return session_startup_pref_; 439 return session_startup_pref_;
441 } 440 }
442 441
443 private: 442 private:
444 SessionStartupPref::Type session_startup_pref_; 443 SessionStartupPref::Type session_startup_pref_;
445 444
446 DISALLOW_COPY_AND_ASSIGN(AppControllerOpenShortcutOnStartupBrowserTest); 445 DISALLOW_COPY_AND_ASSIGN(AppControllerOpenShortcutOnStartupBrowserTest);
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 ui_test_utils::NavigateToURL(browser3, test_url1); 907 ui_test_utils::NavigateToURL(browser3, test_url1);
909 EXPECT_EQ(g_handoff_url, GURL()); 908 EXPECT_EQ(g_handoff_url, GURL());
910 909
911 // Activate the original browser window. 910 // Activate the original browser window.
912 Browser* browser1 = active_browser_list->get(0); 911 Browser* browser1 = active_browser_list->get(0);
913 browser1->window()->Show(); 912 browser1->window()->Show();
914 EXPECT_EQ(g_handoff_url, test_url2); 913 EXPECT_EQ(g_handoff_url, test_url2);
915 } 914 }
916 915
917 } // namespace 916 } // namespace
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/budget_service/budget_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698