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

Side by Side Diff: chrome/test/base/testing_browser_process.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 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
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/test/base/testing_browser_process.h" 5 #include "chrome/test/base/testing_browser_process.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/time/default_tick_clock.h" 9 #include "base/time/default_tick_clock.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 } 249 }
250 250
251 message_center::MessageCenter* TestingBrowserProcess::message_center() { 251 message_center::MessageCenter* TestingBrowserProcess::message_center() {
252 return message_center::MessageCenter::Get(); 252 return message_center::MessageCenter::Get();
253 } 253 }
254 254
255 IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() { 255 IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() {
256 return nullptr; 256 return nullptr;
257 } 257 }
258 void TestingBrowserProcess::CreateDevToolsHttpProtocolHandler( 258 void TestingBrowserProcess::CreateDevToolsHttpProtocolHandler(
259 chrome::HostDesktopType host_desktop_type, 259 ui::HostDesktopType host_desktop_type,
260 const std::string& ip, 260 const std::string& ip,
261 uint16 port) { 261 uint16 port) {}
262 }
263 262
264 unsigned int TestingBrowserProcess::AddRefModule() { 263 unsigned int TestingBrowserProcess::AddRefModule() {
265 return ++module_ref_count_; 264 return ++module_ref_count_;
266 } 265 }
267 266
268 unsigned int TestingBrowserProcess::ReleaseModule() { 267 unsigned int TestingBrowserProcess::ReleaseModule() {
269 DCHECK_GT(module_ref_count_, 0U); 268 DCHECK_GT(module_ref_count_, 0U);
270 return --module_ref_count_; 269 return --module_ref_count_;
271 } 270 }
272 271
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 453
455 /////////////////////////////////////////////////////////////////////////////// 454 ///////////////////////////////////////////////////////////////////////////////
456 455
457 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() { 456 TestingBrowserProcessInitializer::TestingBrowserProcessInitializer() {
458 TestingBrowserProcess::CreateInstance(); 457 TestingBrowserProcess::CreateInstance();
459 } 458 }
460 459
461 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() { 460 TestingBrowserProcessInitializer::~TestingBrowserProcessInitializer() {
462 TestingBrowserProcess::DeleteInstance(); 461 TestingBrowserProcess::DeleteInstance();
463 } 462 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698