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

Side by Side Diff: chrome/browser/net/http_server_properties_manager_unittest.cc

Issue 10500016: Move test_browser_thread.h from content\test to content\public\test. This way we can enforce that i… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 6 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) 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/net/http_server_properties_manager.h" 5 #include "chrome/browser/net/http_server_properties_manager.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/base/testing_pref_service.h" 11 #include "chrome/test/base/testing_pref_service.h"
12 #include "content/test/test_browser_thread.h" 12 #include "content/public/test/test_browser_thread.h"
13 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace chrome_browser_net { 17 namespace chrome_browser_net {
18 18
19 namespace { 19 namespace {
20 20
21 using ::testing::_; 21 using ::testing::_;
22 using ::testing::Invoke; 22 using ::testing::Invoke;
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 // Run the task after shutdown, but before deletion. 440 // Run the task after shutdown, but before deletion.
441 loop_.RunAllPending(); 441 loop_.RunAllPending();
442 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); 442 Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
443 http_server_props_manager_.reset(); 443 http_server_props_manager_.reset();
444 loop_.RunAllPending(); 444 loop_.RunAllPending();
445 } 445 }
446 446
447 } // namespace 447 } // namespace
448 448
449 } // namespace chrome_browser_net 449 } // namespace chrome_browser_net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698