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

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

Issue 200713005: components: Rename encryptor directory to os_crypt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/chrome_browser.gypi ('k') | chrome/test/base/test_launcher_utils.cc » ('j') | 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/in_process_browser_test.h" 5 #include "chrome/test/base/in_process_browser_test.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/common/chrome_paths.h" 34 #include "chrome/common/chrome_paths.h"
35 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
36 #include "chrome/common/logging_chrome.h" 36 #include "chrome/common/logging_chrome.h"
37 #include "chrome/common/url_constants.h" 37 #include "chrome/common/url_constants.h"
38 #include "chrome/renderer/chrome_content_renderer_client.h" 38 #include "chrome/renderer/chrome_content_renderer_client.h"
39 #include "chrome/test/base/chrome_test_suite.h" 39 #include "chrome/test/base/chrome_test_suite.h"
40 #include "chrome/test/base/test_launcher_utils.h" 40 #include "chrome/test/base/test_launcher_utils.h"
41 #include "chrome/test/base/test_switches.h" 41 #include "chrome/test/base/test_switches.h"
42 #include "chrome/test/base/testing_browser_process.h" 42 #include "chrome/test/base/testing_browser_process.h"
43 #include "chrome/test/base/ui_test_utils.h" 43 #include "chrome/test/base/ui_test_utils.h"
44 #include "components/encryptor/os_crypt.h" 44 #include "components/os_crypt/os_crypt.h"
45 #include "content/public/browser/notification_service.h" 45 #include "content/public/browser/notification_service.h"
46 #include "content/public/browser/notification_types.h" 46 #include "content/public/browser/notification_types.h"
47 #include "content/public/test/browser_test_utils.h" 47 #include "content/public/test/browser_test_utils.h"
48 #include "content/public/test/test_launcher.h" 48 #include "content/public/test/test_launcher.h"
49 #include "content/public/test/test_navigation_observer.h" 49 #include "content/public/test/test_navigation_observer.h"
50 #include "net/test/embedded_test_server/embedded_test_server.h" 50 #include "net/test/embedded_test_server/embedded_test_server.h"
51 #include "net/test/spawned_test_server/spawned_test_server.h" 51 #include "net/test/spawned_test_server/spawned_test_server.h"
52 52
53 #if defined(OS_MACOSX) 53 #if defined(OS_MACOSX)
54 #include "base/mac/scoped_nsautorelease_pool.h" 54 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 // On the Mac, this eventually reaches 471 // On the Mac, this eventually reaches
472 // -[BrowserWindowController windowWillClose:], which will post a deferred 472 // -[BrowserWindowController windowWillClose:], which will post a deferred
473 // -autorelease on itself to ultimately destroy the Browser object. The line 473 // -autorelease on itself to ultimately destroy the Browser object. The line
474 // below is necessary to pump these pending messages to ensure all Browsers 474 // below is necessary to pump these pending messages to ensure all Browsers
475 // get deleted. 475 // get deleted.
476 content::RunAllPendingInMessageLoop(); 476 content::RunAllPendingInMessageLoop();
477 delete autorelease_pool_; 477 delete autorelease_pool_;
478 autorelease_pool_ = NULL; 478 autorelease_pool_ = NULL;
479 #endif 479 #endif
480 } 480 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/test/base/test_launcher_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698