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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h" 13 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager_observer.h"
14 #include "chrome/browser/prefs/scoped_user_pref_update.h" 14 #include "chrome/browser/prefs/scoped_user_pref_update.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/test/base/in_process_browser_test.h" 17 #include "chrome/test/base/in_process_browser_test.h"
18 #include "net/base/host_port_pair.h" 18 #include "net/base/host_port_pair.h"
19 #include "net/base/mock_host_resolver.h" 19 #include "net/dns/mock_host_resolver.h"
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 namespace { 23 namespace {
24 24
25 const char kWebstoreDomain[] = "cws.com"; 25 const char kWebstoreDomain[] = "cws.com";
26 26
27 class TestKioskAppManagerObserver : public KioskAppManagerObserver { 27 class TestKioskAppManagerObserver : public KioskAppManagerObserver {
28 public: 28 public:
29 explicit TestKioskAppManagerObserver(KioskAppManager* manager) 29 explicit TestKioskAppManagerObserver(KioskAppManager* manager)
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 282
283 base::FilePath expected_icon_path; 283 base::FilePath expected_icon_path;
284 ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path)); 284 ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &expected_icon_path));
285 expected_icon_path = expected_icon_path. 285 expected_icon_path = expected_icon_path.
286 AppendASCII(KioskAppManager::kIconCacheDir). 286 AppendASCII(KioskAppManager::kIconCacheDir).
287 AppendASCII(apps[0].id).AddExtension(".png"); 287 AppendASCII(apps[0].id).AddExtension(".png");
288 EXPECT_EQ(expected_icon_path.value(), icon_path_string); 288 EXPECT_EQ(expected_icon_path.value(), icon_path_string);
289 } 289 }
290 290
291 } // namespace chromeos 291 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698