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

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

Issue 14828010: Revert 200576 "Move winaura specific methods and members from ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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 | « trunk/src/chrome/test/base/testing_browser_process.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/string_util.h" 8 #include "base/string_util.h"
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 #if defined(OS_IOS) || defined (OS_ANDROID) 319 #if defined(OS_IOS) || defined (OS_ANDROID)
320 NOTIMPLEMENTED(); 320 NOTIMPLEMENTED();
321 return NULL; 321 return NULL;
322 #else 322 #else
323 if (!media_file_system_registry_) 323 if (!media_file_system_registry_)
324 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry()); 324 media_file_system_registry_.reset(new chrome::MediaFileSystemRegistry());
325 return media_file_system_registry_.get(); 325 return media_file_system_registry_.get();
326 #endif 326 #endif
327 } 327 }
328 328
329 void TestingBrowserProcess::PlatformSpecificCommandLineProcessing(
330 const CommandLine& command_line) {
331 }
332
329 bool TestingBrowserProcess::created_local_state() const { 333 bool TestingBrowserProcess::created_local_state() const {
330 return (local_state_ != NULL); 334 return (local_state_ != NULL);
331 } 335 }
332 336
333 void TestingBrowserProcess::SetBookmarkPromptController( 337 void TestingBrowserProcess::SetBookmarkPromptController(
334 BookmarkPromptController* controller) { 338 BookmarkPromptController* controller) {
335 #if !defined(OS_IOS) 339 #if !defined(OS_IOS)
336 bookmark_prompt_controller_.reset(controller); 340 bookmark_prompt_controller_.reset(controller);
337 #endif 341 #endif
338 } 342 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 #endif 383 #endif
380 } 384 }
381 385
382 void TestingBrowserProcess::SetSafeBrowsingService( 386 void TestingBrowserProcess::SetSafeBrowsingService(
383 SafeBrowsingService* sb_service) { 387 SafeBrowsingService* sb_service) {
384 #if !defined(OS_IOS) 388 #if !defined(OS_IOS)
385 NOTIMPLEMENTED(); 389 NOTIMPLEMENTED();
386 sb_service_ = sb_service; 390 sb_service_ = sb_service;
387 #endif 391 #endif
388 } 392 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/test/base/testing_browser_process.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698