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

Side by Side Diff: chrome/browser/extensions/extension_rlz_apitest.cc

Issue 3211004: Revert 57572 - Remove the default argument from RegKey::Open.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 3 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 | « base/registry.h ('k') | chrome/browser/extensions/external_registry_extension_provider_win.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "base/registry.h" 7 #include "base/registry.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/extensions/extension_function.h" 9 #include "chrome/browser/extensions/extension_function.h"
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" 10 #include "chrome/browser/extensions/extension_function_dispatcher.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 ASSERT_TRUE(rlz_lib::SetAccessPointRlz(rlz_lib::GD_DESKBAND, "rlz_apitest")); 64 ASSERT_TRUE(rlz_lib::SetAccessPointRlz(rlz_lib::GD_DESKBAND, "rlz_apitest"));
65 65
66 // Now run all the tests. 66 // Now run all the tests.
67 ASSERT_TRUE(RunExtensionTest("rlz")) << message_; 67 ASSERT_TRUE(RunExtensionTest("rlz")) << message_;
68 68
69 ASSERT_EQ(1, MockRlzSendFinancialPingFunction::expected_count()); 69 ASSERT_EQ(1, MockRlzSendFinancialPingFunction::expected_count());
70 ExtensionFunctionDispatcher::ResetFunctions(); 70 ExtensionFunctionDispatcher::ResetFunctions();
71 71
72 // Now make sure we recorded what was expected. If the code in test.js 72 // Now make sure we recorded what was expected. If the code in test.js
73 // changes, need to make appropriate changes here. 73 // changes, need to make appropriate changes here.
74 key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\N", 74 key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\N");
75 KEY_READ);
76 ASSERT_TRUE(key.Valid()); 75 ASSERT_TRUE(key.Valid());
77 76
78 DWORD value; 77 DWORD value;
79 ASSERT_TRUE(key.ReadValueDW(L"D3I", &value)); 78 ASSERT_TRUE(key.ReadValueDW(L"D3I", &value));
80 ASSERT_EQ(1, value); 79 ASSERT_EQ(1, value);
81 ASSERT_TRUE(key.ReadValueDW(L"D3S", &value)); 80 ASSERT_TRUE(key.ReadValueDW(L"D3S", &value));
82 ASSERT_EQ(1, value); 81 ASSERT_EQ(1, value);
83 ASSERT_TRUE(key.ReadValueDW(L"D3F", &value)); 82 ASSERT_TRUE(key.ReadValueDW(L"D3F", &value));
84 ASSERT_EQ(1, value); 83 ASSERT_EQ(1, value);
85 84
86 ASSERT_TRUE(key.ReadValueDW(L"D4I", &value)); 85 ASSERT_TRUE(key.ReadValueDW(L"D4I", &value));
87 ASSERT_EQ(1, value); 86 ASSERT_EQ(1, value);
88 87
89 key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D", 88 key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D");
90 KEY_READ);
91 ASSERT_FALSE(key.Valid()); 89 ASSERT_FALSE(key.Valid());
92 90
93 // Cleanup. 91 // Cleanup.
94 rlz_lib::ClearProductState(rlz_lib::PINYIN_IME, access_points); 92 rlz_lib::ClearProductState(rlz_lib::PINYIN_IME, access_points);
95 } 93 }
OLDNEW
« no previous file with comments | « base/registry.h ('k') | chrome/browser/extensions/external_registry_extension_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698