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

Side by Side Diff: chrome/browser/rlz/rlz_extension_apitest.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 (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 <map> 5 #include <map>
6 6
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/extensions/extension_function.h" 9 #include "chrome/browser/extensions/extension_function.h"
9 #include "chrome/browser/extensions/extension_function_dispatcher.h" 10 #include "chrome/browser/extensions/extension_function_dispatcher.h"
10 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/browser/rlz/rlz_extension_api.h" 11 #include "chrome/browser/rlz/rlz_extension_api.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/extensions/extension.h" 13 #include "chrome/common/extensions/extension.h"
14 #include "net/base/mock_host_resolver.h" 14 #include "net/dns/mock_host_resolver.h"
15 #include "rlz/lib/rlz_lib.h" 15 #include "rlz/lib/rlz_lib.h"
16 16
17 #if (OS_WIN) 17 #if (OS_WIN)
18 #include "base/win/registry.h" 18 #include "base/win/registry.h"
19 #endif 19 #endif
20 20
21 class MockRlzSendFinancialPingFunction : public RlzSendFinancialPingFunction { 21 class MockRlzSendFinancialPingFunction : public RlzSendFinancialPingFunction {
22 public: 22 public:
23 static int expected_count() { 23 static int expected_count() {
24 return expected_count_; 24 return expected_count_;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ASSERT_EQ(1, value); 119 ASSERT_EQ(1, value);
120 120
121 key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D", 121 key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D",
122 KEY_READ); 122 KEY_READ);
123 ASSERT_FALSE(key.Valid()); 123 ASSERT_FALSE(key.Valid());
124 #endif 124 #endif
125 125
126 // Cleanup. 126 // Cleanup.
127 rlz_lib::ClearProductState(rlz_lib::PINYIN_IME, access_points); 127 rlz_lib::ClearProductState(rlz_lib::PINYIN_IME, access_points);
128 } 128 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698