chrome/browser/task_manager/task_manager_browsertest.cc - Issue 12518036: net: move host_resolver files from net/base to net/dns

Side by Side Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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

« no previous file with comments | « chrome/browser/sync/test/integration/sync_test.h ('k') | chrome/browser/ui/browser_browsertest.cc » ('j') | webkit/DEPS » ('J')

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 "chrome/browser/task_manager/task_manager.h"	5 #include "chrome/browser/task_manager/task_manager.h"

6	6

7 #include "base/files/file_path.h"	7 #include "base/files/file_path.h"

8 #include "base/stringprintf.h"	8 #include "base/stringprintf.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "chrome/browser/background/background_contents_service.h"	10 #include "chrome/browser/background/background_contents_service.h"

(...skipping 19 matching lines...) Expand all Loading...
30 #include "chrome/browser/web_applications/web_app.h"	30 #include "chrome/browser/web_applications/web_app.h"

31 #include "chrome/common/chrome_notification_types.h"	31 #include "chrome/common/chrome_notification_types.h"

32 #include "chrome/common/chrome_switches.h"	32 #include "chrome/common/chrome_switches.h"

33 #include "chrome/common/extensions/extension.h"	33 #include "chrome/common/extensions/extension.h"

34 #include "chrome/test/base/in_process_browser_test.h"	34 #include "chrome/test/base/in_process_browser_test.h"

35 #include "chrome/test/base/ui_test_utils.h"	35 #include "chrome/test/base/ui_test_utils.h"

36 #include "content/public/browser/notification_service.h"	36 #include "content/public/browser/notification_service.h"

37 #include "content/public/common/content_switches.h"	37 #include "content/public/common/content_switches.h"

38 #include "content/public/common/page_transition_types.h"	38 #include "content/public/common/page_transition_types.h"

39 #include "grit/generated_resources.h"	39 #include "grit/generated_resources.h"

40 #include "net/base/mock_host_resolver.h"	40 #include "net/dns/mock_host_resolver.h"

41 #include "testing/gtest/include/gtest/gtest.h"	41 #include "testing/gtest/include/gtest/gtest.h"

42 #include "ui/base/l10n/l10n_util.h"	42 #include "ui/base/l10n/l10n_util.h"

43	43

44 // http://crbug.com/31663	44 // http://crbug.com/31663

45 // TODO(linux_aura) http://crbug.com/163931	45 // TODO(linux_aura) http://crbug.com/163931

46 #if !(defined(OS_WIN) && defined(USE_AURA)) && !(defined(OS_LINUX) && !defined(O S_CHROMEOS) && defined(USE_AURA))	46 #if !(defined(OS_WIN) && defined(USE_AURA)) && !(defined(OS_LINUX) && !defined(O S_CHROMEOS) && defined(USE_AURA))

47	47

48 using content::WebContents;	48 using content::WebContents;

49	49

50 // On Linux this is crashing intermittently http://crbug/84719	50 // On Linux this is crashing intermittently http://crbug/84719

(...skipping 490 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
541 // Check that we get some value for the cache columns.	541 // Check that we get some value for the cache columns.

542 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count),	542 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count),

543 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));	543 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));

544 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count),	544 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count),

545 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));	545 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));

546 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count),	546 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count),

547 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));	547 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));

548 }	548 }

549	549

550 #endif	550 #endif

OLD	NEW