| OLD | NEW |
| 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 "base/auto_reset.h" | 5 #include "base/auto_reset.h" |
| 6 #include "base/files/scoped_temp_dir.h" | 6 #include "base/files/scoped_temp_dir.h" |
| 7 #include "base/json/json_reader.h" | 7 #include "base/json/json_reader.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/history/download_row.h" | 10 #include "chrome/browser/history/download_row.h" |
| 11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/webui/downloads_dom_handler.h" | 13 #include "chrome/browser/ui/webui/downloads_dom_handler.h" |
| 14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "chrome/test/base/in_process_browser_test.h" | 15 #include "chrome/test/base/in_process_browser_test.h" |
| 16 #include "chrome/test/base/ui_test_utils.h" | |
| 17 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/test/test_utils.h" |
| 18 | 18 |
| 19 namespace { | 19 namespace { |
| 20 | 20 |
| 21 // Reads |right_json| into a ListValue |left_list|; returns true if all | 21 // Reads |right_json| into a ListValue |left_list|; returns true if all |
| 22 // key-value pairs in in all dictionaries in |right_list| are also in the | 22 // key-value pairs in in all dictionaries in |right_list| are also in the |
| 23 // corresponding dictionary in |left_list|. Ignores keys in dictionaries in | 23 // corresponding dictionary in |left_list|. Ignores keys in dictionaries in |
| 24 // |left_list| that are not in the corresponding dictionary in |right_list|. | 24 // |left_list| that are not in the corresponding dictionary in |right_list|. |
| 25 bool ListMatches(base::ListValue* left_list, const std::string& right_json) { | 25 bool ListMatches(base::ListValue* left_list, const std::string& right_json) { |
| 26 scoped_ptr<base::Value> right_value(base::JSONReader::Read(right_json)); | 26 scoped_ptr<base::Value> right_value(base::JSONReader::Read(right_json)); |
| 27 base::ListValue* right_list = NULL; | 27 base::ListValue* right_list = NULL; |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 // TODO(benjhayden): Test incognito, both downloads_list() and that on-record | 248 // TODO(benjhayden): Test incognito, both downloads_list() and that on-record |
| 249 // calls can't access off-record items. | 249 // calls can't access off-record items. |
| 250 | 250 |
| 251 // TODO(benjhayden): Test that bad download ids incoming from the javascript are | 251 // TODO(benjhayden): Test that bad download ids incoming from the javascript are |
| 252 // dropped on the floor. | 252 // dropped on the floor. |
| 253 | 253 |
| 254 // TODO(benjhayden): Test that IsTemporary() downloads are not shown. | 254 // TODO(benjhayden): Test that IsTemporary() downloads are not shown. |
| 255 | 255 |
| 256 // TODO(benjhayden): Test that RemoveObserver is called on all download items, | 256 // TODO(benjhayden): Test that RemoveObserver is called on all download items, |
| 257 // including items that crossed IsTemporary() and back. | 257 // including items that crossed IsTemporary() and back. |
| OLD | NEW |