diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-27 19:20:18 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-27 19:20:18 +0000 |
| commit | 4f3b44679a442a13d949ca2deea1bc15612e8db0 (patch) | |
| tree | 467728ace4aace084d1da233b7023b9e28487032 /chrome_frame | |
| parent | c7007d8241c86117f650361929c6887fd57522c4 (diff) | |
| download | chromium_src-4f3b44679a442a13d949ca2deea1bc15612e8db0.zip chromium_src-4f3b44679a442a13d949ca2deea1bc15612e8db0.tar.gz chromium_src-4f3b44679a442a13d949ca2deea1bc15612e8db0.tar.bz2 | |
importer: Allow chrome to import internal chrome pages (i.e, chrome:// and about: urls).
Bookmark Manager allow users to import and export bookmarks to a html file,
while it allow the users to export bookmarks like about:blank, chrome://version,
it doesn't allow to import such bookmarks. This patch changes that behavior
allowing the "Import Bookmarks from HTML File" process to import bookmarks
with schemes like about: and chrome://.
BUG=223528
TEST=bookmark some internal chrome pages (ones that start with chrome://* or about:*).
Export then to html file through Bookmark Manager. Now import that html file,
all the entries should be imported correctly.
TBR=dbeam@chromium.org, isherman@chromium.org, pkasting@chromium.org, thakis@chromium.org
Review URL: https://codereview.chromium.org/19461003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214052 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index ffc4197..389a3ab 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -38,7 +38,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/test/test_file_util.h" #include "base/time/time.h" -#include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/prefs/pref_service_mock_builder.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" @@ -46,6 +45,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" +#include "chrome/common/net/url_fixer_upper.h" #include "chrome/common/pref_names.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" |