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

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

Issue 2454093003: MD Settings: Update Content Settings Types URLs. (Closed)
Patch Set: address pkasting comments Created 4 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
« no previous file with comments | « chrome/browser/resources/settings/route.js ('k') | chrome/browser/ui/chrome_pages.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 #include "chrome/browser/ui/browser_navigator_browsertest.h" 5 #include "chrome/browser/ui/browser_navigator_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 GURL GetGoogleURL() { 47 GURL GetGoogleURL() {
48 return GURL("http://www.google.com/"); 48 return GURL("http://www.google.com/");
49 } 49 }
50 50
51 GURL GetSettingsURL() { 51 GURL GetSettingsURL() {
52 return GURL(chrome::kChromeUISettingsURL); 52 return GURL(chrome::kChromeUISettingsURL);
53 } 53 }
54 54
55 GURL GetContentSettingsURL() { 55 GURL GetContentSettingsURL() {
56 return GetSettingsURL().Resolve(chrome::kContentSettingsExceptionsSubPage); 56 return GetSettingsURL().Resolve(chrome::kContentSettingsSubPage);
57 } 57 }
58 58
59 GURL GetClearBrowsingDataURL() { 59 GURL GetClearBrowsingDataURL() {
60 return GetSettingsURL().Resolve(chrome::kClearBrowserDataSubPage); 60 return GetSettingsURL().Resolve(chrome::kClearBrowserDataSubPage);
61 } 61 }
62 62
63 // Converts long uber URLs ("chrome://chrome/foo/") to short (virtual) URLs 63 // Converts long uber URLs ("chrome://chrome/foo/") to short (virtual) URLs
64 // ("chrome://foo/"). This should be used to convert the return value of 64 // ("chrome://foo/"). This should be used to convert the return value of
65 // WebContentsImpl::GetURL before comparison because it can return either the 65 // WebContentsImpl::GetURL before comparison because it can return either the
66 // real URL or the virtual URL. 66 // real URL or the virtual URL.
(...skipping 1376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1443 EXPECT_EQ(expected_title, params.target_contents->GetTitle()); 1443 EXPECT_EQ(expected_title, params.target_contents->GetTitle());
1444 // GURL always keeps non-ASCII characters escaped, but check them anyways. 1444 // GURL always keeps non-ASCII characters escaped, but check them anyways.
1445 EXPECT_EQ(GURL(expected_url).spec(), params.target_contents->GetURL().spec()); 1445 EXPECT_EQ(GURL(expected_url).spec(), params.target_contents->GetURL().spec());
1446 // Check the omnibox text. It should have escaped RTL with unescaped text. 1446 // Check the omnibox text. It should have escaped RTL with unescaped text.
1447 LocationBar* location_bar = browser()->window()->GetLocationBar(); 1447 LocationBar* location_bar = browser()->window()->GetLocationBar();
1448 OmniboxView* omnibox_view = location_bar->GetOmniboxView(); 1448 OmniboxView* omnibox_view = location_bar->GetOmniboxView();
1449 EXPECT_EQ(base::UTF8ToUTF16(expected_url), omnibox_view->GetText()); 1449 EXPECT_EQ(base::UTF8ToUTF16(expected_url), omnibox_view->GetText());
1450 } 1450 }
1451 1451
1452 } // namespace 1452 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/route.js ('k') | chrome/browser/ui/chrome_pages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698