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

Side by Side Diff: chrome/browser/chromeos/drive/search_metadata_unittest.cc

Issue 13866009: Remove root resource id aliasing from DriveResourceMetadata. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove other resource id check. Created 7 years, 8 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 "chrome/browser/chromeos/drive/search_metadata.h" 5 #include "chrome/browser/chromeos/drive/search_metadata.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/threading/sequenced_worker_pool.h" 9 #include "base/threading/sequenced_worker_pool.h"
10 #include "chrome/browser/chromeos/drive/drive_cache.h" 10 #include "chrome/browser/chromeos/drive/drive_cache.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter); 49 fake_free_disk_space_getter_.reset(new FakeFreeDiskSpaceGetter);
50 50
51 drive_cache_.reset(new DriveCache( 51 drive_cache_.reset(new DriveCache(
52 DriveCache::GetCacheRootPath(profile_.get()), 52 DriveCache::GetCacheRootPath(profile_.get()),
53 blocking_task_runner_, 53 blocking_task_runner_,
54 fake_free_disk_space_getter_.get())); 54 fake_free_disk_space_getter_.get()));
55 55
56 drive_webapps_registry_.reset(new DriveWebAppsRegistry); 56 drive_webapps_registry_.reset(new DriveWebAppsRegistry);
57 57
58 resource_metadata_.reset(new DriveResourceMetadata( 58 resource_metadata_.reset(new DriveResourceMetadata(
59 fake_drive_service_->GetRootResourceId(),
60 drive_cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META), 59 drive_cache_->GetCacheDirectoryPath(DriveCache::CACHE_TYPE_META),
61 blocking_task_runner_)); 60 blocking_task_runner_));
62 61
63 file_system_.reset(new DriveFileSystem(profile_.get(), 62 file_system_.reset(new DriveFileSystem(profile_.get(),
64 drive_cache_.get(), 63 drive_cache_.get(),
65 fake_drive_service_.get(), 64 fake_drive_service_.get(),
66 drive_webapps_registry_.get(), 65 drive_webapps_registry_.get(),
67 resource_metadata_.get(), 66 resource_metadata_.get(),
68 blocking_task_runner_)); 67 blocking_task_runner_));
69 file_system_->Initialize(); 68 file_system_->Initialize();
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 EXPECT_EQ("&lt;<b>hello</b>&gt;", highlighted_text); 360 EXPECT_EQ("&lt;<b>hello</b>&gt;", highlighted_text);
362 } 361 }
363 362
364 TEST(SearchMetadataSimpleTest, FindAndHighlight_MoreMetaChars) { 363 TEST(SearchMetadataSimpleTest, FindAndHighlight_MoreMetaChars) {
365 std::string highlighted_text; 364 std::string highlighted_text;
366 EXPECT_TRUE(FindAndHighlight("a&b&c&d", "b&c", &highlighted_text)); 365 EXPECT_TRUE(FindAndHighlight("a&b&c&d", "b&c", &highlighted_text));
367 EXPECT_EQ("a&amp;<b>b&amp;c</b>&amp;d", highlighted_text); 366 EXPECT_EQ("a&amp;<b>b&amp;c</b>&amp;d", highlighted_text);
368 } 367 }
369 368
370 } // namespace drive 369 } // namespace drive
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698