chrome/browser/safe_browsing/client_side_detection_host_unittest.cc - Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base.

Side by Side Diff: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

Issue 7048007: Move scoped_temp_dir and scoped_native_library back from base/memory to base. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: scriptfix Created 9 years, 7 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/safe_browsing/bloom_filter_unittest.cc ('k') | chrome/browser/safe_browsing/client_side_detection_service_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/file_path.h"	6 #include "base/file_path.h"

7 #include "base/memory/ref_counted.h"	7 #include "base/memory/ref_counted.h"

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/memory/scoped_temp_dir.h"	9 #include "base/scoped_temp_dir.h"

10 #include "base/task.h"	10 #include "base/task.h"

11 #include "chrome/browser/safe_browsing/client_side_detection_host.h"	11 #include "chrome/browser/safe_browsing/client_side_detection_host.h"

12 #include "chrome/browser/safe_browsing/client_side_detection_service.h"	12 #include "chrome/browser/safe_browsing/client_side_detection_service.h"

13 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	13 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

	14 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

	15 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"

14 #include "chrome/common/chrome_switches.h"	16 #include "chrome/common/chrome_switches.h"

15 #include "chrome/common/safe_browsing/csd.pb.h"	17 #include "chrome/common/safe_browsing/csd.pb.h"

16 #include "chrome/common/safe_browsing/safebrowsing_messages.h"	18 #include "chrome/common/safe_browsing/safebrowsing_messages.h"

17 #include "chrome/test/testing_profile.h"	19 #include "chrome/test/testing_profile.h"

18 #include "chrome/test/ui_test_utils.h"	20 #include "chrome/test/ui_test_utils.h"

19 #include "content/browser/browser_thread.h"	21 #include "content/browser/browser_thread.h"

20 #include "content/browser/renderer_host/test_render_view_host.h"	22 #include "content/browser/renderer_host/test_render_view_host.h"

21 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"

22 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

23 #include "content/browser/tab_contents/test_tab_contents.h"	23 #include "content/browser/tab_contents/test_tab_contents.h"

24 #include "googleurl/src/gurl.h"	24 #include "googleurl/src/gurl.h"

25 #include "ipc/ipc_test_sink.h"	25 #include "ipc/ipc_test_sink.h"

26 #include "testing/gmock/include/gmock/gmock.h"	26 #include "testing/gmock/include/gmock/gmock.h"

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

28	28

29 using ::testing::_;	29 using ::testing::_;

30 using ::testing::DeleteArg;	30 using ::testing::DeleteArg;

31 using ::testing::DoAll;	31 using ::testing::DoAll;

32 using ::testing::Eq;	32 using ::testing::Eq;

(...skipping 563 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
596 // Now we check that all expected functions were indeed called on the two	596 // Now we check that all expected functions were indeed called on the two

597 // service objects.	597 // service objects.

598 EXPECT_TRUE(Mock::VerifyAndClear(csd_service_.get()));	598 EXPECT_TRUE(Mock::VerifyAndClear(csd_service_.get()));

599 EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));	599 EXPECT_TRUE(Mock::VerifyAndClear(sb_service_.get()));

600 msg = process()->sink().GetFirstMessageMatching(	600 msg = process()->sink().GetFirstMessageMatching(

601 SafeBrowsingMsg_StartPhishingDetection::ID);	601 SafeBrowsingMsg_StartPhishingDetection::ID);

602 ASSERT_FALSE(msg);	602 ASSERT_FALSE(msg);

603 }	603 }

604	604

605 } // namespace safe_browsing	605 } // namespace safe_browsing

OLD	NEW