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

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

Issue 7537033: Move more files from chrome/test to chrome/test/base, part #5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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/browser_main.h" 5 #include "chrome/browser/browser_main.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/test/testing_pref_service.h" 11 #include "chrome/test/base/testing_pref_service.h"
12 #include "content/common/main_function_params.h" 12 #include "content/common/main_function_params.h"
13 #include "content/common/sandbox_init_wrapper.h" 13 #include "content/common/sandbox_init_wrapper.h"
14 #include "net/socket/client_socket_pool_base.h" 14 #include "net/socket/client_socket_pool_base.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 class BrowserMainTest : public testing::Test { 17 class BrowserMainTest : public testing::Test {
18 public: 18 public:
19 BrowserMainTest() : command_line_(CommandLine::NO_PROGRAM) {} 19 BrowserMainTest() : command_line_(CommandLine::NO_PROGRAM) {}
20 protected: 20 protected:
21 virtual void SetUp() { 21 virtual void SetUp() {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100"); 59 command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "100");
60 60
61 scoped_ptr<MainFunctionParams> params( 61 scoped_ptr<MainFunctionParams> params(
62 new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL)); 62 new MainFunctionParams(command_line_, *sandbox_init_wrapper_, NULL));
63 scoped_ptr<BrowserMainParts> bw(BrowserMainParts::CreateBrowserMainParts( 63 scoped_ptr<BrowserMainParts> bw(BrowserMainParts::CreateBrowserMainParts(
64 *params)); 64 *params));
65 65
66 EXPECT_DEBUG_DEATH(bw->WarmConnectionFieldTrial(), 66 EXPECT_DEBUG_DEATH(bw->WarmConnectionFieldTrial(),
67 "Not a valid socket reuse policy group"); 67 "Not a valid socket reuse policy group");
68 } 68 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags_unittest.cc ('k') | chrome/browser/chromeos/notifications/desktop_notifications_unittest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698