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

Side by Side Diff: chrome_frame/test/simple_resource_loader_test.cc

Issue 5685007: Rename all methods accessing Singleton<T> as GetInstance(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years 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_frame/simple_resource_loader.cc ('k') | ipc/ipc_channel_posix.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 "chrome_frame/simple_resource_loader.h" 5 #include "chrome_frame/simple_resource_loader.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/win/windows_version.h" 8 #include "base/win/windows_version.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 SimpleResourceLoader::LoadLocaleDll(language_tags, locales_path, 50 SimpleResourceLoader::LoadLocaleDll(language_tags, locales_path,
51 &dll_handle, &file_path)); 51 &dll_handle, &file_path));
52 if (NULL != dll_handle) { 52 if (NULL != dll_handle) {
53 FreeLibrary(dll_handle); 53 FreeLibrary(dll_handle);
54 dll_handle = NULL; 54 dll_handle = NULL;
55 } 55 }
56 EXPECT_TRUE(file_path.BaseName() == FilePath(L"en-US.dll")); 56 EXPECT_TRUE(file_path.BaseName() == FilePath(L"en-US.dll"));
57 } 57 }
58 58
59 TEST(SimpleResourceLoaderTest, InstanceTest) { 59 TEST(SimpleResourceLoaderTest, InstanceTest) {
60 SimpleResourceLoader* loader = SimpleResourceLoader::instance(); 60 SimpleResourceLoader* loader = SimpleResourceLoader::GetInstance();
61 61
62 ASSERT_TRUE(NULL != loader); 62 ASSERT_TRUE(NULL != loader);
63 ASSERT_TRUE(NULL != loader->GetResourceModuleHandle()); 63 ASSERT_TRUE(NULL != loader->GetResourceModuleHandle());
64 } 64 }
OLDNEW
« no previous file with comments | « chrome_frame/simple_resource_loader.cc ('k') | ipc/ipc_channel_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698