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

Side by Side Diff: chrome/browser/chromeos/login/kiosk_browsertest.cc

Issue 15069003: Rename the embedded test server to EmbeddedTestServer in net::test_server namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/stringprintf.h" 7 #include "base/stringprintf.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chrome_browser_main.h" 9 #include "chrome/browser/chrome_browser_main.h"
10 #include "chrome/browser/chrome_browser_main_extra_parts.h" 10 #include "chrome/browser/chrome_browser_main_extra_parts.h"
(...skipping 20 matching lines...) Expand all
31 #include "chrome/test/base/interactive_test_utils.h" 31 #include "chrome/test/base/interactive_test_utils.h"
32 #include "chrome/test/base/ui_test_utils.h" 32 #include "chrome/test/base/ui_test_utils.h"
33 #include "chromeos/chromeos_switches.h" 33 #include "chromeos/chromeos_switches.h"
34 #include "content/public/browser/notification_observer.h" 34 #include "content/public/browser/notification_observer.h"
35 #include "content/public/browser/notification_registrar.h" 35 #include "content/public/browser/notification_registrar.h"
36 #include "content/public/browser/notification_service.h" 36 #include "content/public/browser/notification_service.h"
37 #include "content/public/test/test_utils.h" 37 #include "content/public/test/test_utils.h"
38 #include "google_apis/gaia/gaia_switches.h" 38 #include "google_apis/gaia/gaia_switches.h"
39 #include "net/base/host_port_pair.h" 39 #include "net/base/host_port_pair.h"
40 #include "net/dns/mock_host_resolver.h" 40 #include "net/dns/mock_host_resolver.h"
41 #include "net/test/embedded_test_server/embedded_test_server.h"
41 #include "net/test/embedded_test_server/http_request.h" 42 #include "net/test/embedded_test_server/http_request.h"
42 #include "net/test/embedded_test_server/http_response.h" 43 #include "net/test/embedded_test_server/http_response.h"
43 #include "net/test/embedded_test_server/http_server.h"
44 #include "testing/gmock/include/gmock/gmock.h" 44 #include "testing/gmock/include/gmock/gmock.h"
45 #include "testing/gtest/include/gtest/gtest.h" 45 #include "testing/gtest/include/gtest/gtest.h"
46 46
47 using namespace google_apis; 47 using namespace net::test_server;
48 using namespace google_apis::test_server;
49 48
50 namespace chromeos { 49 namespace chromeos {
51 50
52 namespace { 51 namespace {
53 52
54 const char kWebstoreDomain[] = "cws.com"; 53 const char kWebstoreDomain[] = "cws.com";
55 54
56 // Webstore data json is in 55 // Webstore data json is in
57 // chrome/test/data/chromeos/app_mode/webstore/inlineinstall/ 56 // chrome/test/data/chromeos/app_mode/webstore/inlineinstall/
58 // detail/ggbflgnkafappblpkiflbgpmkfdpnhhe 57 // detail/ggbflgnkafappblpkiflbgpmkfdpnhhe
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 // The second loop exits when kiosk app terminates and we receive 217 // The second loop exits when kiosk app terminates and we receive
219 // NOTIFICATION_RENDERER_PROCESS_CLOSED. 218 // NOTIFICATION_RENDERER_PROCESS_CLOSED.
220 scoped_refptr<content::MessageLoopRunner> runner2 = 219 scoped_refptr<content::MessageLoopRunner> runner2 =
221 new content::MessageLoopRunner; 220 new content::MessageLoopRunner;
222 content_browser_client_->browser_main_extra_parts_->set_quit_task( 221 content_browser_client_->browser_main_extra_parts_->set_quit_task(
223 runner2->QuitClosure()); 222 runner2->QuitClosure());
224 runner2->Run(); 223 runner2->Run();
225 } 224 }
226 225
227 } // namespace chromeos 226 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc ('k') | chrome/browser/chromeos/login/oobe_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698