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

Side by Side Diff: chrome/browser/cookies_tree_model_unittest.cc

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 3 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/cookies_tree_model.h" 5 #include "chrome/browser/cookies_tree_model.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "chrome/browser/content_settings/host_content_settings_map.h" 9 #include "chrome/browser/content_settings/host_content_settings_map.h"
10 #include "chrome/browser/content_settings/mock_settings_observer.h" 10 #include "chrome/browser/content_settings/mock_settings_observer.h"
11 #include "chrome/browser/mock_browsing_data_appcache_helper.h" 11 #include "chrome/browser/mock_browsing_data_appcache_helper.h"
12 #include "chrome/browser/mock_browsing_data_cookie_helper.h" 12 #include "chrome/browser/mock_browsing_data_cookie_helper.h"
13 #include "chrome/browser/mock_browsing_data_database_helper.h" 13 #include "chrome/browser/mock_browsing_data_database_helper.h"
14 #include "chrome/browser/mock_browsing_data_file_system_helper.h" 14 #include "chrome/browser/mock_browsing_data_file_system_helper.h"
15 #include "chrome/browser/mock_browsing_data_indexed_db_helper.h" 15 #include "chrome/browser/mock_browsing_data_indexed_db_helper.h"
16 #include "chrome/browser/mock_browsing_data_quota_helper.h" 16 #include "chrome/browser/mock_browsing_data_quota_helper.h"
17 #include "chrome/browser/mock_browsing_data_local_storage_helper.h" 17 #include "chrome/browser/mock_browsing_data_local_storage_helper.h"
18 #include "chrome/test/base/testing_browser_process_test.h"
19 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
20 #include "content/common/content_notification_types.h" 19 #include "content/common/content_notification_types.h"
21 #include "content/common/notification_details.h" 20 #include "content/common/notification_details.h"
22 #include "net/url_request/url_request_context.h" 21 #include "net/url_request/url_request_context.h"
23 #include "net/url_request/url_request_context_getter.h" 22 #include "net/url_request/url_request_context_getter.h"
24 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
25 24
26 #include "base/utf_string_conversions.h" 25 #include "base/utf_string_conversions.h"
27 26
28 using ::testing::_; 27 using ::testing::_;
29 28
30 namespace { 29 namespace {
31 30
32 class CookiesTreeModelTest : public TestingBrowserProcessTest { 31 class CookiesTreeModelTest : public testing::Test {
33 public: 32 public:
34 CookiesTreeModelTest() : ui_thread_(BrowserThread::UI, &message_loop_), 33 CookiesTreeModelTest() : ui_thread_(BrowserThread::UI, &message_loop_),
35 io_thread_(BrowserThread::IO, &message_loop_) { 34 io_thread_(BrowserThread::IO, &message_loop_) {
36 } 35 }
37 36
38 virtual ~CookiesTreeModelTest() { 37 virtual ~CookiesTreeModelTest() {
39 } 38 }
40 39
41 virtual void SetUp() OVERRIDE { 40 virtual void SetUp() OVERRIDE {
42 profile_.reset(new TestingProfile()); 41 profile_.reset(new TestingProfile());
(...skipping 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 cookies_model->UpdateSearchResults(std::wstring(L"fshost3")); 992 cookies_model->UpdateSearchResults(std::wstring(L"fshost3"));
994 EXPECT_EQ("http://fshost3:3/", 993 EXPECT_EQ("http://fshost3:3/",
995 GetDisplayedFileSystems(cookies_model.get())); 994 GetDisplayedFileSystems(cookies_model.get()));
996 995
997 cookies_model->UpdateSearchResults(std::wstring()); 996 cookies_model->UpdateSearchResults(std::wstring());
998 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/", 997 EXPECT_EQ("http://fshost1:1/,http://fshost2:2/,http://fshost3:3/",
999 GetDisplayedFileSystems(cookies_model.get())); 998 GetDisplayedFileSystems(cookies_model.get()));
1000 } 999 }
1001 1000
1002 } // namespace 1001 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698